theta passes gamma tests, ufo stuff inpro

Author: tpd11

src/main/java/hotciv/framework/GameType.java

@@ -8,5 +8,6 @@ public enum GameType {
     epsilonCiv,
     zetaCiv,
     etaCiv,
-    semiCiv
+    semiCiv,
+    thetaCiv
 }

src/main/java/hotciv/helpers/actionManagers/thetaActionManager.java

@@ -27,6 +27,15 @@ else if(Objects.equals(g.getTileAt(p).getTypeString(), FOREST)){
          }
      }
 
-
+    @Override
+    public void settlerAction(GameImpl g, Position p) {
+        g.setCityAt(p, g.getUnitOwner(p));
+        g.removeUnitAt(p);
+    }
+
+    @Override
+    public void archerAction(GameImpl g, Position p) {
+        g.getUnitAt(p).fortify();
+    }
 
 }

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

@@ -103,6 +103,10 @@ public GameImpl(GameType ruleSet, int numPlayers) {
                 this.manager_factory = new semiManagerFactory();
                 break;
 
+            case thetaCiv:
+                this.manager_factory = new thetaManagerFactory();
+                break;
+
             default:
                 this.manager_factory = new alphaManagerFactory();
                 break;

src/test/java/hotciv/standard/thetaCiv_tests.java

@@ -0,0 +1,88 @@
+package hotciv.standard;
+
+import hotciv.framework.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static hotciv.framework.GameConstants.ARCHER;
+import static hotciv.framework.GameConstants.SETTLER;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+
+public class thetaCiv_tests {
+    private GameImpl game; //Changed Game to GameImpl -TPD
+
+    /**
+     * Fixture for thetaCiv testing.
+     */
+    @Before
+    public void setUp() {
+        game = new GameImpl(GameType.thetaCiv, 2);
+    }
+
+    //..........Unit Tests...........//
+
+    @Test
+    public void settlerActionToCity(){
+        //Player red has a settler at (3,4) in the test game constructor
+        Position posSettler = new Position(3, 4);
+        game.createUnitAt(posSettler, SETTLER, Player.RED);
+        //game.setCityAt(posSettler, game.getUnitAt(posSettler).getOwner()); //old code
+        game.performUnitActionAt(posSettler); //with refactoring
+        assertThat(game.getCityAt(posSettler).getOwner(), is(Player.RED) );
+        assertThat(game.getCityAt(posSettler).getSize(), is(1));
+        assertNull(game.getUnitAt(posSettler));
+    }
+
+    @Test
+    public void archerFortifyDoublesDefense(){ //simulate fortifying an archer
+        Position posArcher = new Position(0,2);
+        game.createUnitAt(posArcher, ARCHER, Player.RED);
+        game.getUnitAt(posArcher).setDefensiveStrength(2);
+        game.performUnitActionAt(posArcher);
+        assertThat(game.getUnitAt(posArcher).getDefensiveStrength(), is(4));
+    }
+    @Test
+    public void archerFortifyHalvesDefense(){ //simulate fortifying an already fortified archer
+        Position posArcher = new Position(0,2);
+        game.createUnitAt(posArcher, ARCHER, Player.RED);
+        game.getUnitAt(posArcher).setDefensiveStrength(1);
+        game.getUnitAt(posArcher).fortify();
+        game.performUnitActionAt(posArcher);
+        assertThat(game.getUnitAt(posArcher).getDefensiveStrength(), is(1));
+    }
+
+    //...............Integration Testing...................//
+
+    @Test
+    public void settlerActionToCityIntegrated(){
+        //Player red has a settler at (3,4) in the test game constructor
+        Position posSettler = new Position(3, 4);
+        game.createUnitAt(posSettler, SETTLER, Player.RED);
+        game.performUnitActionAt(posSettler);
+        assertThat(game.getCityAt(posSettler).getOwner(), is(Player.RED) );
+        assertThat(game.getCityAt(posSettler).getSize(), is(1));
+        assertNull(game.getUnitAt(posSettler));
+    }
+
+    @Test
+    public void archerFortifyDoublesDefenseIntegrated(){ //simulate fortifying an archer
+        Position posArcher = new Position(0,2);
+        game.createUnitAt(posArcher, ARCHER, Player.RED);
+        game.getUnitAt(posArcher).setDefensiveStrength(2);
+        game.performUnitActionAt(posArcher);
+        assertThat(game.getUnitAt(posArcher).getDefensiveStrength(), is(4));
+    }
+    @Test
+    public void archerFortifyHalvesDefenseIntegrated(){ //simulate fortifying an already fortified archer
+        Position posArcher = new Position(0,2);
+        game.createUnitAt(posArcher, ARCHER, Player.RED);
+        game.getUnitAt(posArcher).setDefensiveStrength(1);
+        game.getUnitAt(posArcher).fortify();
+        game.performUnitActionAt(posArcher);
+        assertThat(game.getUnitAt(posArcher).getDefensiveStrength(), is(1));
+    }
+}