Added more unit tests, fixed more than one unit per tile

Author: map588

src/main/java/hotciv/framework/Game.java

@@ -1,5 +1,7 @@
 package hotciv.framework;
 
+import hotciv.standard.UnitImpl;
+
 /** Game is the central interface allowing a client to access and
  * modify the state of a HotCiv game.  
 
@@ -133,5 +135,6 @@ public interface Game {
    * @param p the position of a unit that must perform its action.
    * Nothing happens in case the unit has no associated action.
    */
-  public void performUnitActionAt( Position p );  
+  public void performUnitActionAt( Position p );
+
 }

src/main/java/hotciv/standard/GameImpl.java

@@ -67,6 +67,14 @@ public GameImpl() {   //Constructor for GameImpl
             for (int j = 0; j < WORLDSIZE; j++)
                 world[i][j] = new TileImpl();
 
+        for (int i = 0; i < WORLDSIZE; i++)
+            for (int j = 0; j < WORLDSIZE; j++)
+                units[i][j] = null;
+
+        for (int i = 0; i < WORLDSIZE; i++)
+            for (int j = 0; j < WORLDSIZE; j++)
+                cities[i][j] = null;
+
         //set the special tiles
         world[1][0].setTerrain(OCEANS);
         world[0][1].setTerrain(HILLS);
@@ -83,27 +91,30 @@ public GameImpl() {   //Constructor for GameImpl
         Position posArcher = new Position(0,2);
         Position posSettler = new Position(3, 4);
         Position posLegion = new Position(2,3);
-        setUnitAt(posArcher, ARCHER, Player.RED);
-        setUnitAt(posSettler, SETTLER, Player.RED);
-        setUnitAt(posLegion, LEGION, Player.BLUE);
+        createUnitAt(posArcher, ARCHER, Player.RED);
+        createUnitAt(posSettler, SETTLER, Player.RED);
+        createUnitAt(posLegion, LEGION, Player.BLUE);
 
 
         this.year = -4000;
-
  }
 
 
   public Tile getTileAt( Position p ) {
     return world[p.getColumn()][p.getRow()];
   }
+
   public Unit getUnitAt( Position p ) {
     return this.units[p.getColumn()][p.getRow()];
   }
 
   //This will be changed later to account for the conditions needed to buy and place units -MAP
-  public boolean setUnitAt( Position p, String unitType, Player owner ) {
-    this.units[p.getColumn()][p.getRow()] = new UnitImpl(unitType, owner);
-    return true;
+  public boolean createUnitAt( Position p, String unitType, Player owner ) {
+        if(this.units[p.getColumn()][p.getRow()] != null) {
+            return false;
+        }
+        this.units[p.getColumn()][p.getRow()] = new UnitImpl(unitType, owner);
+        return true;
   }
 
   public City getCityAt( Position p ) {
@@ -133,7 +144,7 @@ public int getAge() {
   }
 
   public boolean moveUnit( Position from, Position to ) {
-    if(units[from.getColumn()][from.getRow()] != null) {
+    if(units[from.getColumn()][from.getRow()] != null && units[to.getColumn()][to.getRow()] == null) {
         units[to.getColumn()][to.getRow()] = units[from.getColumn()][from.getRow()];
         units[from.getColumn()][from.getRow()] = null;
         return true;
@@ -172,9 +183,13 @@ public void performUnitActionAt( Position p ) {
 
 
   //----------------- True / False Queries ---------------------//
+
     public boolean isPlayerInGame(Player player) {
         return Players.contains(player);
     }
 
 
+
+
+
 }

src/main/java/hotciv/standard/UnitImpl.java

@@ -32,6 +32,8 @@ public UnitImpl(String type, Player owner) {
      * least those listed in GameConstants, particular variants
      * may define more strings to be valid.
      */
+
+    //---------------------Getters---------------------//
     public String getTypeString() {
         return this.type.toString();
     }
@@ -87,8 +89,7 @@ public static boolean valid_unit_type(String type){
     } catch (IllegalArgumentException e) {
         return false;
     }
-
-    return true;
-}
+        return true;
+    }
 
 }

src/test/java/hotciv/standard/unit_tests.java

@@ -1,6 +1,7 @@
 package hotciv.standard;
 
 
+import hotciv.framework.Player;
 import hotciv.framework.Position;
 import hotciv.framework.Game;
 import org.junit.Before;
@@ -44,7 +45,9 @@
 public class unit_tests {
   private Game game;
 
-  /** Fixture for alphaciv testing. */
+  /**
+   * Fixture for alphaciv testing.
+   */
   @Before
   public void setUp() {
     game = new GameImpl();
@@ -53,11 +56,30 @@ public void setUp() {
 
   @Test
   public void startingUnits() {
-    Position posArcher = new Position(0,2);
-    Position posSettler = new Position(3,4);
-    Position posLegion = new Position(2,3);
+    Position posArcher = new Position(0, 2);
+    Position posSettler = new Position(3, 4);
+    Position posLegion = new Position(2, 3);
     assertThat(game.getUnitAt(posArcher).getTypeString(), is(ARCHER));
     assertThat(game.getUnitAt(posSettler).getTypeString(), is(SETTLER));
     assertThat(game.getUnitAt(posLegion).getTypeString(), is(LEGION));
   }
-}
+
+
+  @Test
+  public void oneUnitPerTile() {
+    Position posArcher = new Position(0, 2);
+    Position posSettler = new Position(3, 4);
+    Position posLegion = new Position(2, 3);
+    assertThat(game.getUnitAt(posArcher).getTypeString(), is(ARCHER));
+    assertThat(game.getUnitAt(posSettler).getTypeString(), is(SETTLER));
+    assertThat(game.getUnitAt(posLegion).getTypeString(), is(LEGION));
+
+    boolean oneUnitPerTile = game.moveUnit(posArcher, posLegion);
+    boolean oneUnitPerTile2 = game.moveUnit(posLegion, posArcher);
+    boolean oneUnitPerTile3 = game.moveUnit(posSettler, posSettler);
+
+    boolean unitsPlacedOverEachOther = oneUnitPerTile || oneUnitPerTile2 || oneUnitPerTile3;
+
+    assertThat(unitsPlacedOverEachOther, is(false));
+  }
+}