Skip to content

Commit

Permalink
Finishing merged commits
Browse files Browse the repository at this point in the history
  • Loading branch information
Gavin Li committed Apr 10, 2015
1 parent fce685a commit 5248399
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions MerchantRPGCSE2102/src/tests/TestMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public void testMovePlayer() {
map.movePlayer("south");
map.movePlayer("south");
map.movePlayer("south");
assertEquals(player.getX(), 0);
assertEquals(player.getY(), 1);
assertEquals(map.isOccupied(player.getX(), player.getY()), true);
assertEquals(player.getCol(), 0);
assertEquals(player.getRow(), 1);
assertEquals(map.isOccupied(player.getCol(), player.getRow()), true);
}

}

0 comments on commit 5248399

Please sign in to comment.