From 5248399e1625e26e42bc4c9dd768d512531bdc74 Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Fri, 10 Apr 2015 12:47:30 -0400
Subject: [PATCH] Finishing merged commits

---
 MerchantRPGCSE2102/src/tests/TestMap.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MerchantRPGCSE2102/src/tests/TestMap.java b/MerchantRPGCSE2102/src/tests/TestMap.java
index 3475d69..dfabe86 100644
--- a/MerchantRPGCSE2102/src/tests/TestMap.java
+++ b/MerchantRPGCSE2102/src/tests/TestMap.java
@@ -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);
 	}
 
 }