Fix parameter names of calls to gameplay_test_runner.run_test()

nycrat · nycrat · commit 43af45c11d82 · 2026-05-30T15:19:32.000-07:00
diff --git a/src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py b/src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py
@@ -184,21 +184,20 @@ def run_ball_placement_scenario(
     ]
 
     gameplay_test_runner.run_test(
-        setup=lambda test_setup_arg: ball_placement_play_setup(
+        setup=lambda: ball_placement_play_setup(
             ball_start_point,
             ball_placement_point,
             gameplay_test_runner,
             blue_only,
         ),
-        inv_always_validation_sequence_set=[[]],
-        inv_eventually_validation_sequence_set=placement_eventually_validation_sequence_set,
+        eventually_validation_sequence_set=placement_eventually_validation_sequence_set,
         test_timeout_s=15,
     )
 
     gameplay_test_runner.run_test(
         # setup argument isn't passed to preserve world state from previous test run
-        inv_always_validation_sequence_set=drop_ball_always_validation_sequence_set,
-        inv_eventually_validation_sequence_set=drop_ball_eventually_validation_sequence_set,
+        always_validation_sequence_set=drop_ball_always_validation_sequence_set,
+        eventually_validation_sequence_set=drop_ball_eventually_validation_sequence_set,
         test_timeout_s=5,
     )
 
diff --git a/src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py b/src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py
@@ -72,8 +72,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/defense/defense_play_test.py b/src/software/ai/hl/stp/play/defense/defense_play_test.py
@@ -61,14 +61,14 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=[
+        always_validation_sequence_set=[
             [
                 BallNeverEntersRegion(
                     regions=[tbots_cpp.Field.createSSLDivisionBField().friendlyGoal()]
                 )
             ]
         ],
-        inv_eventually_validation_sequence_set=[
+        eventually_validation_sequence_set=[
             [FriendlyEventuallyHasBallPossession(tolerance=0.2)]
         ],
         test_timeout_s=20,
@@ -123,14 +123,14 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=[
+        always_validation_sequence_set=[
             [
                 BallNeverEntersRegion(
                     regions=[tbots_cpp.Field.createSSLDivisionBField().friendlyGoal()]
                 )
             ]
         ],
-        inv_eventually_validation_sequence_set=[
+        eventually_validation_sequence_set=[
             [FriendlyEventuallyHasBallPossession(tolerance=0.1)]
         ],
         test_timeout_s=30,
diff --git a/src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py b/src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py
@@ -143,8 +143,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=8,
     )
 
diff --git a/src/software/ai/hl/stp/play/example/example_play_test.py b/src/software/ai/hl/stp/play/example/example_play_test.py
@@ -74,8 +74,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py b/src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py
@@ -91,8 +91,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/halt_play/halt_play_test.py b/src/software/ai/hl/stp/play/halt_play/halt_play_test.py
@@ -51,13 +51,9 @@ def setup():
             gc_command=Command.Type.FORCE_START, team=Team.UNKNOWN
         )
 
-    # params just have to be a list of length 1 to ensure the test runs at least once
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=[[]],
-        inv_eventually_validation_sequence_set=[
-            [RobotSpeedEventuallyBelowThreshold(1e-3)]
-        ],
+        eventually_validation_sequence_set=[[RobotSpeedEventuallyBelowThreshold(1e-3)]],
         ci_cmd_with_delay=[
             (3, Command.Type.HALT, Team.BLUE),
             (3, Command.Type.HALT, Team.YELLOW),
diff --git a/src/software/ai/hl/stp/play/kickoff_enemy/kickoff_enemy_play_test.py b/src/software/ai/hl/stp/play/kickoff_enemy/kickoff_enemy_play_test.py
@@ -140,10 +140,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/kickoff_friendly/kickoff_friendly_play_test.py b/src/software/ai/hl/stp/play/kickoff_friendly/kickoff_friendly_play_test.py
@@ -140,10 +140,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/kickoff_play_test.py b/src/software/ai/hl/stp/play/kickoff_play_test.py
@@ -138,8 +138,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/offense/offense_play_test.py b/src/software/ai/hl/stp/play/offense/offense_play_test.py
@@ -60,18 +60,14 @@ def setup():
     field = tbots_cpp.Field.createSSLDivisionBField()
 
     # Always Validation
-    inv_always_validation_sequence_set = [
+    always_validation_sequence_set = [
         [BallAlwaysStaysInRegion(regions=[field.fieldBoundary()])],
         [NeverExcessivelyDribbles()],
     ]
 
-    # Eventually Validation
-    inv_eventually_validation_sequence_set = [[]]
-
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=inv_eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=inv_always_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=15,
         run_till_end=True,
     )
diff --git a/src/software/ai/hl/stp/play/passing_sim_test.py b/src/software/ai/hl/stp/play/passing_sim_test.py
@@ -246,7 +246,7 @@ def test_passing_receive_speed(
     ]
 
     gameplay_test_runner.run_test(
-        setup=lambda param: setup_pass_and_robots(
+        setup=lambda: setup_pass_and_robots(
             ball_initial_position=ball_initial_position,
             ball_initial_velocity=ball_initial_velocity,
             attacker_robot_position=attacker_robot_position,
@@ -381,8 +381,8 @@ def test_passing_no_backwards_passes(
     ]
 
     gameplay_test_runner.run_test(
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=10,
         run_till_end=False,
     )
diff --git a/src/software/ai/hl/stp/play/penalty_kick_enemy/penalty_kick_enemy_play_test.py b/src/software/ai/hl/stp/play/penalty_kick_enemy/penalty_kick_enemy_play_test.py
@@ -173,8 +173,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
         test_timeout_s=20,
     )
 
diff --git a/src/software/ai/hl/stp/play/shoot_or_chip/shoot_or_chip_play_test.py b/src/software/ai/hl/stp/play/shoot_or_chip/shoot_or_chip_play_test.py
@@ -64,8 +64,6 @@ def setup():
     # TODO (#3651): add validations
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=[[]],
-        ag_eventually_validation_sequence_set=[[]],
         test_timeout_s=10,
     )
 
diff --git a/src/software/ai/hl/stp/play/shoot_or_pass/shoot_or_pass_play_test.py b/src/software/ai/hl/stp/play/shoot_or_pass/shoot_or_pass_play_test.py
@@ -57,8 +57,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=15,
         run_till_end=False,
     )
diff --git a/src/software/ai/hl/stp/play/stop_play_test.py b/src/software/ai/hl/stp/play/stop_play_test.py
@@ -165,8 +165,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=always_stop_play_rules,
-        ag_always_validation_sequence_set=always_stop_play_rules,
+        always_validation_sequence_set=always_stop_play_rules,
         test_timeout_s=6,
     )
 
diff --git a/src/software/ai/hl/stp/tactic/attacker/attacker_tactic_test.py b/src/software/ai/hl/stp/tactic/attacker/attacker_tactic_test.py
@@ -168,8 +168,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
         run_till_end=False,
         test_timeout_s=7,
     )
@@ -279,8 +278,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
     )
 
 
@@ -380,8 +378,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
         run_till_end=False,
         test_timeout_s=9,
     )
diff --git a/src/software/ai/hl/stp/tactic/chip/chip_tactic_test.py b/src/software/ai/hl/stp/tactic/chip/chip_tactic_test.py
@@ -86,8 +86,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
     )
 
 
diff --git a/src/software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic_test.py b/src/software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic_test.py
@@ -54,8 +54,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_always_validation_sequence_set=always_validations,
-        ag_always_validation_sequence_set=always_validations,
+        always_validation_sequence_set=always_validations,
     )
 
 
@@ -176,8 +175,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=5,
     )
 
@@ -261,10 +259,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=4,
     )
 
@@ -358,10 +354,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=3,
     )
 
@@ -439,10 +433,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
     )
 
 
diff --git a/src/software/ai/hl/stp/tactic/dribble/dribble_tactic_test.py b/src/software/ai/hl/stp/tactic/dribble/dribble_tactic_test.py
@@ -179,8 +179,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=25,
         run_till_end=False,
     )
@@ -332,10 +331,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        inv_always_validation_sequence_set=always_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_always_validation_sequence_set=always_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
+        always_validation_sequence_set=always_validation_sequence_set,
     )
 
 
@@ -380,8 +377,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validation_sequence_set,
-        ag_eventually_validation_sequence_set=eventually_validation_sequence_set,
+        eventually_validation_sequence_set=eventually_validation_sequence_set,
         test_timeout_s=10,
     )
 
@@ -431,8 +427,7 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
+        eventually_validation_sequence_set=eventually_validations,
         test_timeout_s=10,
     )
 
@@ -477,10 +472,8 @@ def setup():
 
     gameplay_test_runner.run_test(
         setup=setup,
-        inv_eventually_validation_sequence_set=eventually_validations,
-        ag_eventually_validation_sequence_set=eventually_validations,
-        inv_always_validation_sequence_set=always_validations,
-        ag_always_validation_sequence_set=always_validations,
+        eventually_validation_sequence_set=eventually_validations,
+        always_validation_sequence_set=always_validations,
     )
 
 
diff --git a/src/software/ai/hl/stp/tactic/goalie/goalie_tactic_test.py b/src/software/ai/hl/stp/tactic/goalie/goalie_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.py b/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/kick/kick_tactic_test.py b/src/software/ai/hl/stp/tactic/kick/kick_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/pass_defender/pass_defender_tactic_test.py b/src/software/ai/hl/stp/tactic/pass_defender/pass_defender_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_tactic_test.py b/src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/pivot_kick/pivot_kick_tactic_test.py b/src/software/ai/hl/stp/tactic/pivot_kick/pivot_kick_tactic_test.py
diff --git a/src/software/ai/hl/stp/tactic/receiver/receiver_tactic_test.py b/src/software/ai/hl/stp/tactic/receiver/receiver_tactic_test.py
diff --git a/src/software/ai/navigator/trajectory/simulated_hrvo_test.py b/src/software/ai/navigator/trajectory/simulated_hrvo_test.py

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,7 @@ def setup():`
`72`	`72`
`73`	`73`	`gameplay_test_runner.run_test(`
`74`	`74`	`setup=setup,`
`75`		`- inv_eventually_validation_sequence_set=eventually_validations,`
`76`		`- ag_eventually_validation_sequence_set=eventually_validations,`
	`75`	`+ eventually_validation_sequence_set=eventually_validations,`
`77`	`76`	`test_timeout_s=10,`
`78`	`77`	`)`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,14 @@ def setup():`
`61`	`61`
`62`	`62`	`gameplay_test_runner.run_test(`
`63`	`63`	`setup=setup,`
`64`		`- inv_always_validation_sequence_set=[`
	`64`	`+ always_validation_sequence_set=[`
`65`	`65`	`[`
`66`	`66`	`BallNeverEntersRegion(`
`67`	`67`	`regions=[tbots_cpp.Field.createSSLDivisionBField().friendlyGoal()]`
`68`	`68`	`)`
`69`	`69`	`]`
`70`	`70`	`],`
`71`		`- inv_eventually_validation_sequence_set=[`
	`71`	`+ eventually_validation_sequence_set=[`
`72`	`72`	`[FriendlyEventuallyHasBallPossession(tolerance=0.2)]`
`73`	`73`	`],`
`74`	`74`	`test_timeout_s=20,`
`@@ -123,14 +123,14 @@ def setup():`
`123`	`123`
`124`	`124`	`gameplay_test_runner.run_test(`
`125`	`125`	`setup=setup,`
`126`		`- inv_always_validation_sequence_set=[`
	`126`	`+ always_validation_sequence_set=[`
`127`	`127`	`[`
`128`	`128`	`BallNeverEntersRegion(`
`129`	`129`	`regions=[tbots_cpp.Field.createSSLDivisionBField().friendlyGoal()]`
`130`	`130`	`)`
`131`	`131`	`]`
`132`	`132`	`],`
`133`		`- inv_eventually_validation_sequence_set=[`
	`133`	`+ eventually_validation_sequence_set=[`
`134`	`134`	`[FriendlyEventuallyHasBallPossession(tolerance=0.1)]`
`135`	`135`	`],`
`136`	`136`	`test_timeout_s=30,`
Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@ def setup():`
`143`	`143`
`144`	`144`	`gameplay_test_runner.run_test(`
`145`	`145`	`setup=setup,`
`146`		`- inv_eventually_validation_sequence_set=eventually_validation_sequence_set,`
`147`		`- inv_always_validation_sequence_set=always_validation_sequence_set,`
	`146`	`+ eventually_validation_sequence_set=eventually_validation_sequence_set,`
	`147`	`+ always_validation_sequence_set=always_validation_sequence_set,`
`148`	`148`	`test_timeout_s=8,`
`149`	`149`	`)`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ def setup():`
`74`	`74`
`75`	`75`	`gameplay_test_runner.run_test(`
`76`	`76`	`setup=setup,`
`77`		`- inv_eventually_validation_sequence_set=eventually_validations,`
`78`		`- ag_eventually_validation_sequence_set=eventually_validations,`
	`77`	`+ eventually_validation_sequence_set=eventually_validations,`
`79`	`78`	`test_timeout_s=10,`
`80`	`79`	`)`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,7 @@ def setup():`
`91`	`91`
`92`	`92`	`gameplay_test_runner.run_test(`
`93`	`93`	`setup=setup,`
`94`		`- inv_eventually_validation_sequence_set=eventually_validations,`
`95`		`- ag_eventually_validation_sequence_set=eventually_validations,`
	`94`	`+ eventually_validation_sequence_set=eventually_validations,`
`96`	`95`	`test_timeout_s=10,`
`97`	`96`	`)`
`98`	`97`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,8 @@ def setup():`
`138`	`138`
`139`	`139`	`gameplay_test_runner.run_test(`
`140`	`140`	`setup=setup,`
`141`		`- inv_eventually_validation_sequence_set=eventually_validation_sequence_set,`
`142`		`- inv_always_validation_sequence_set=always_validation_sequence_set,`
	`141`	`+ eventually_validation_sequence_set=eventually_validation_sequence_set,`
	`142`	`+ always_validation_sequence_set=always_validation_sequence_set,`
`143`	`143`	`test_timeout_s=10,`
`144`	`144`	`)`
`145`	`145`