add tests (#136)

Author: zeitlinger

server/src/combat.rs

@@ -116,7 +116,6 @@ pub fn initiate_combat(
     can_retreat: bool,
     next_game_state: Option<GameState>,
 ) {
-    game.lock_undo();
     let initiation = next_game_state.map_or_else(
         || Box::new(mem::replace(&mut game.state, Playing)),
         Box::new,
@@ -137,30 +136,33 @@ pub fn initiate_combat(
 }
 
 pub(crate) fn start_combat(game: &mut Game, combat: Combat, skip: Option<CombatModifier>) {
-    if skip != Some(CancelFortressExtraDie) {
-        if skip != Some(SteelWeaponsDefender) {
-            if skip != Some(SteelWeaponsAttacker)
-                && start_steel_weapons_phase(
-                    game,
-                    combat.clone(),
-                    combat.attacker,
-                    SteelWeaponsAttacker,
-                )
-            {
-                return;
-            }
-            if start_steel_weapons_phase(
-                game,
-                combat.clone(),
-                combat.defender,
-                SteelWeaponsDefender,
-            ) {
-                return;
-            }
-        }
-        if start_siegecraft_phase(game, combat.clone()) {
-            return;
-        }
+    game.lock_undo();
+    let evaluate: &[CombatModifier] = match skip {
+        None => &[
+            SteelWeaponsAttacker,
+            SteelWeaponsDefender,
+            CancelFortressExtraDie,
+        ],
+        Some(SteelWeaponsAttacker) => &[SteelWeaponsDefender, CancelFortressExtraDie],
+        Some(SteelWeaponsDefender) => &[CancelFortressExtraDie],
+        Some(CancelFortressExtraDie) => &[],
+        _ => panic!("Illegal action"),
+    };
+
+    if evaluate.contains(&SteelWeaponsAttacker)
+        && start_steel_weapons_phase(game, combat.clone(), combat.attacker, SteelWeaponsAttacker)
+    {
+        return;
+    }
+
+    if evaluate.contains(&SteelWeaponsDefender)
+        && start_steel_weapons_phase(game, combat.clone(), combat.defender, SteelWeaponsDefender)
+    {
+        return;
+    }
+
+    if evaluate.contains(&CancelFortressExtraDie) && start_siegecraft_phase(game, combat.clone()) {
+        return;
     }
 
     combat_loop(game, combat);

server/tests/game_api_tests.rs

@@ -421,12 +421,49 @@ fn game_path(name: &str) -> String {
     format!("tests{SEPARATOR}test_games{SEPARATOR}{name}.json")
 }
 
+fn test_actions(name: &str, player_index: usize, actions: Vec<Action>) {
+    for (i, action) in actions.into_iter().enumerate() {
+        let from = if i == 0 {
+            name.to_string()
+        } else {
+            format!("{name}.outcome{}", i - 1)
+        };
+        test_action_internal(
+            &from,
+            &format!("{name}.outcome{i}"),
+            action,
+            player_index,
+            false,
+            false,
+        );
+    }
+}
+
 fn test_action(
     name: &str,
     action: Action,
     player_index: usize,
     undoable: bool,
     illegal_action_test: bool,
+) {
+    let outcome = format!("{name}.outcome");
+    test_action_internal(
+        name,
+        &outcome,
+        action,
+        player_index,
+        undoable,
+        illegal_action_test,
+    );
+}
+
+fn test_action_internal(
+    name: &str,
+    outcome: &str,
+    action: Action,
+    player_index: usize,
+    undoable: bool,
+    illegal_action_test: bool,
 ) {
     let a = serde_json::to_string(&action).expect("action should be serializable");
     let a2 = serde_json::from_str(&a).expect("action should be deserializable");
@@ -438,25 +475,24 @@ fn test_action(
         );
         return;
     }
-    let outcome = format!("{name}.outcome");
-    let expected_game = read_game_str(&outcome);
+    let expected_game = read_game_str(outcome);
     assert_eq_game_json(
         &expected_game,
         &to_json(&game),
         name,
-        &outcome,
+        outcome,
         &format!("EXECUTE: the game did not match the expectation after the initial {name} action"),
     );
     if !undoable {
-        assert!(!game.can_undo());
+        assert!(!game.can_undo(), "should not be able to undo");
         return;
     }
     undo_redo(
         name,
         player_index,
         &read_game_str(name),
         game,
-        &outcome,
+        outcome,
         &expected_game,
         0,
     );
@@ -475,10 +511,10 @@ fn read_game_str(name: &str) -> String {
 fn undo_redo(
     name: &str,
     player_index: usize,
-    original_game: &String,
+    original_game: &str,
     game: Game,
-    outcome: &String,
-    expected_game: &String,
+    outcome: &str,
+    expected_game: &str,
     cycle: usize,
 ) {
     if cycle == 2 {
@@ -895,9 +931,9 @@ fn test_remove_casualties_defender_and_defender_wins() {
 }
 
 #[test]
-fn test_direct_capture_city() {
+fn test_direct_capture_city_metallurgy() {
     test_action(
-        "direct_capture_city",
+        "direct_capture_city_metallurgy",
         move_action(vec![0, 1, 2, 3], Position::from_offset("C1")),
         0,
         false,
@@ -939,29 +975,25 @@ fn test_first_combat_round_no_hits_attacker_may_retreat() {
 }
 
 #[test]
-fn test_ask_for_siegecraft() {
-    test_action(
-        "ask_for_siegecraft",
-        move_action(vec![0, 1, 2, 3, 4, 5], Position::from_offset("C1")),
-        0,
-        false,
-        false,
-    );
-}
-
-#[test]
-fn test_attack_with_siegecraft() {
-    test_action(
-        "attack_with_siegecraft",
-        CustomPhase(CustomPhaseAction::SiegecraftPaymentAction(
-            SiegecraftPayment {
-                ignore_hit: ResourcePile::ore(2),
-                extra_die: ResourcePile::empty(),
-            },
-        )),
+fn test_combat_all_modifiers() {
+    test_actions(
+        "combat_all_modifiers",
         0,
-        false,
-        false,
+        vec![
+            move_action(vec![0, 1, 2, 3, 4, 5], Position::from_offset("C1")),
+            CustomPhase(CustomPhaseAction::SteelWeaponsAttackerAction(
+                ResourcePile::ore(1),
+            )),
+            CustomPhase(CustomPhaseAction::SteelWeaponsDefenderAction(
+                ResourcePile::ore(1),
+            )),
+            CustomPhase(CustomPhaseAction::SiegecraftPaymentAction(
+                SiegecraftPayment {
+                    ignore_hit: ResourcePile::ore(2),
+                    extra_die: ResourcePile::empty(),
+                },
+            )),
+        ],
     );
 }
 

server/tests/test_games/ask_for_siegecraft.json server/tests/test_games/combat_all_modifiers.json

@@ -97,7 +97,8 @@
         "Farming",
         "Mining",
         "Siegecraft",
-        "Tactics"
+        "Tactics"    ,
+        "Steel Weapons"
       ],
       "unlocked_special_advance": [],
       "wonders_build": [],
@@ -186,7 +187,8 @@
       "available_leaders": [],
       "advances": [
         "Farming",
-        "Mining"
+        "Mining",
+        "Steel Weapons"
       ],
       "unlocked_special_advance": [],
       "wonders_build": [],

server/tests/test_games/ask_for_siegecraft.outcome.json server/tests/test_games/combat_all_modifiers.outcome0.json

@@ -1,7 +1,7 @@
 {
   "state": {
     "CustomPhase": {
-      "SiegecraftPayment": {
+      "SteelWeaponsAttacker": {
         "initiation": {
           "Movement": {
             "movement_actions_left": 2,
@@ -142,6 +142,7 @@
         "Farming",
         "Mining",
         "Siegecraft",
+        "Steel Weapons",
         "Tactics"
       ],
       "unlocked_special_advance": [],
@@ -231,7 +232,8 @@
       "available_leaders": [],
       "advances": [
         "Farming",
-        "Mining"
+        "Mining",
+        "Steel Weapons"
       ],
       "unlocked_special_advance": [],
       "wonders_build": [],

server/tests/test_games/attack_with_siegecraft.json server/tests/test_games/combat_all_modifiers.outcome1.json

@@ -1,7 +1,7 @@
 {
   "state": {
     "CustomPhase": {
-      "SiegecraftPayment": {
+      "SteelWeaponsDefender": {
         "initiation": {
           "Movement": {
             "movement_actions_left": 2,
@@ -29,7 +29,10 @@
           4,
           5
         ],
-        "can_retreat": true
+        "can_retreat": true,
+        "modifiers": [
+          "SteelWeaponsAttacker"
+        ]
       }
     }
   },
@@ -40,7 +43,7 @@
       "resources": {
         "food": 2,
         "wood": 7,
-        "ore": 7,
+        "ore": 6,
         "ideas": 3,
         "gold": 7,
         "mood_tokens": 7,
@@ -142,6 +145,7 @@
         "Farming",
         "Mining",
         "Siegecraft",
+        "Steel Weapons",
         "Tactics"
       ],
       "unlocked_special_advance": [],
@@ -231,7 +235,8 @@
       "available_leaders": [],
       "advances": [
         "Farming",
-        "Mining"
+        "Mining",
+        "Steel Weapons"
       ],
       "unlocked_special_advance": [],
       "wonders_build": [],
@@ -361,9 +366,16 @@
           "destination": "C1"
         }
       }
+    },
+    {
+      "CustomPhase": {
+        "SteelWeaponsAttackerAction": {
+          "ore": 1
+        }
+      }
     }
   ],
-  "action_log_index": 6,
+  "action_log_index": 7,
   "log": [
     "The game has started",
     "Age 1 has started",
@@ -377,9 +389,10 @@
     "Player2 ended their turn with 3 actions left",
     "It's Player1's turn",
     "Round 2/3",
-    "\tPlayer1 marched 2 settlers, 1 infantry, 1 cavalry, 1 elephant and a leader from C2 to C1"
+    "\tPlayer1 marched 2 settlers, 1 infantry, 1 cavalry, 1 elephant and a leader from C2 to C1",
+    "Player1 paid for steel weapons: 1 ore"
   ],
-  "undo_limit": 6,
+  "undo_limit": 7,
   "actions_left": 2,
   "successful_cultural_influence": false,
   "round": 2,