tests for composition

Author: TRE26

src/main/java/hotciv/framework/GameConstants.java

@@ -45,4 +45,5 @@ public class GameConstants {
   // Valid production balance types
   public static final String productionFocus = "hammer";
   public static final String foodFocus = "apple";
+  public static final boolean WINNER_FOUND = false;
 }

src/test/java/hotciv/standard/game_tests.java

@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static hotciv.framework.GameConstants.WINNER_FOUND;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -73,24 +74,86 @@ public void gameStartIs4000BC() {
   }
 
   @Test
-  public void progress100YearsEveryTurn() {
+  public void alphaCiv_Progress100YearsEveryTurn() {
     int turn1 = game.getAge();
     game.endOfTurn();
     int turn2 = game.getAge();
 
     assertThat((turn2 - turn1), is(100));
   }
 
+  @Test
+  public void betaCiv_DynamicWorldAging() {
+
+    // 100 Years per turn pre- 100BC
+    for (int i = 0; i < 38; i++){
+      game.endOfTurn();
+    }
+    assertThat(game.getAge(), is(-100));
+
+    // Next turn is 1BC
+    game.endOfTurn();
+    assertThat(game.getAge(), is(-1));
+
+    // Next turn is 1AD
+    game.endOfTurn();
+    assertThat(game.getAge(), is(1));
+
+    // Next turn is 50AD
+    game.endOfTurn();
+    assertThat(game.getAge(), is(50));
+
+
+    // 50 years per turn until 1750
+    for (int j = 0; j < 33; j++) {
+      game.endOfTurn();
+    }
+    assertThat(game.getAge(), is(1750));
+
+    // 25 years per turn until 1900
+    for (int h = 0; h < 5; h++) {
+      game.endOfTurn();
+    }
+    assertThat(game.getAge(), is(1900));
+
+    // 5 years per turn until 1970
+    for (int k = 0; k < 34; k++) {
+      game.endOfTurn();
+    }
+    assertThat(game.getAge(), is(1970));
+
+    // 1 year per turn for the rest of the game
+    for (int m = 0; m < 99; m++) {
+      game.endOfTurn();
+    }
+    assertThat(game.getAge(), is(2070));
+  }
+
 
   @Test
-  public void redWinsIf3000BC() {
+  public void alphaCiv_RedWinsIf3000BC() {
     for (int i = 0; i < 10; i++) {
       game.endOfTurn();
     }
     assertThat(game.getAge(), is(-3000));
     assertThat(game.getWinner(), is(Player.RED));
   }
 
+  @Test
+  public void betaCiv_FirstPlayerThatConquersWorldWins() {
+    Position city1 = new Position(1,1);
+    Position city2 = new Position(1,4);
+
+    game.setCityAt(city1, Player.BLUE);
+
+    assertThat(game.getWinner(), is(Player.BLUE)); // Blue owns both cities and should win
+
+    game.setCityAt(city1, Player.RED);
+    game.setCityAt(city2, Player.RED);
+
+    assertThat(game.getWinner(), is(Player.BLUE)); // Blue already won the game, so they remain the winner.
+  }
+
   @Test //TPD
   public void attackingUnitAlwaysWins(){
     Position posArcher = new Position(0, 2); //Attacker