Fixed test errors.

zahlio · Nov 19, 2014 · 7a0b169 · 7a0b169
1 parent e35ff9e
commit 7a0b169
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/test/hotciv/standard/TestAll.java b/test/hotciv/standard/TestAll.java
@@ -16,7 +16,7 @@
 	   TestDeltaCivWorldLayout.class,
 	   TestEpsilonCivAttacking.class,
 	   TestEpsilonCivWinning.class,
-	   TestGammaCiv.class	   
+	   TestGammaCiv.class   
 	})
 	public class TestAll {
 

diff --git a/test/hotciv/standard/TestAlphaCiv.java b/test/hotciv/standard/TestAlphaCiv.java
@@ -256,7 +256,7 @@ public void shouldProduceX(Unit _u, String _unitConstant, Position p){
 					  p.getRow(),
 					  p.getColumn()
 			  ), 
-			  GameConstants.ARCHER,
+			  _unitConstant,
 			  _u.getTypeString()
 	  );
 

diff --git a/test/hotciv/standard/TestGammaCiv.java b/test/hotciv/standard/TestGammaCiv.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertNull;
 import hotciv.common.GameImpl;
 import hotciv.framework.Game;
+import hotciv.framework.Player;
 import hotciv.framework.Position;
 import hotciv.framework.Unit;
 import hotciv.variants.AlphaCivAging;
@@ -26,11 +27,15 @@ public void setUp() {
 	@Test
 	public void settlerShouldHaveCreatedACityAt4_3(){
 		game.performUnitActionAt(new Position(4,3));
-		settlerShouldHaveCreatedACityAt(4, 3);
+		settlerShouldHaveCreatedACityAt(4, 3, Player.RED);
 	}
 
-	public void settlerShouldHaveCreatedACityAt(int x, int y){
-		assertNull(String.format("There should be a city at (%d, %d) owned by player Red", x, y), game.getCityAt(new Position(x, y)));
+	public void settlerShouldHaveCreatedACityAt(int x, int y, Player p){
+		assertEquals(
+				String.format("There should be a city at (%d, %d) owned by player %s", x, y, p), 
+				p, 
+				game.getCityAt(new Position(x, y)).getOwner()
+		);
 	}
 
 	@Test