WIP

Author: nycrat

src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py

@@ -182,28 +182,22 @@ def run_ball_placement_scenario(
     ]
 
     simulated_test_runner.run_test(
-        setup=lambda test_setup_arg: ball_placement_play_setup(
-            test_setup_arg["ball_start_point"],
-            test_setup_arg["ball_placement_point"],
+        setup=lambda: ball_placement_play_setup(
+            ball_start_point,
+            ball_placement_point,
             simulated_test_runner,
             blue_only,
         ),
-        params=[
-            {
-                "ball_start_point": ball_start_point,
-                "ball_placement_point": ball_placement_point,
-            }
-        ],
         always_validation_sequence_set=[[]],
         eventually_validation_sequence_set=placement_eventually_validation_sequence_set,
-        test_timeout_s=[30],
+        test_timeout_s=30,
     )
 
     simulated_test_runner.run_test(
         # setup argument isn't passed to preserve world state from previous test run
         always_validation_sequence_set=drop_ball_always_validation_sequence_set,
         eventually_validation_sequence_set=drop_ball_eventually_validation_sequence_set,
-        test_timeout_s=[10],
+        test_timeout_s=10,
     )
 
 

src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py

@@ -17,7 +17,7 @@ def test_crease_defense_play(simulated_test_runner):
     field = tbots_cpp.Field.createSSLDivisionBField()
     goalie_position = tbots_cpp.Point(-4.5, 0)
 
-    def setup(*args):
+    def setup():
         simulated_test_runner.set_world_state(
             create_world_state(
                 blue_robot_locations=[

src/software/ai/hl/stp/play/defense/defense_play_test.py

@@ -34,7 +34,7 @@
     ],
 )
 def test_defense_play_ball_steal(simulated_test_runner, blue_bots, yellow_bots):
-    def setup(*args):
+    def setup():
         ball_initial_pos = tbots_cpp.Point(0.93, 0)
 
         simulated_test_runner.set_world_state(
@@ -59,7 +59,6 @@ def setup(*args):
 
     simulated_test_runner.run_test(
         setup=setup,
-        params=[0, 1, 2, 3, 4],  # The aggregate test runs 5 times
         always_validation_sequence_set=[
             [
                 BallNeverEntersRegion(
@@ -97,7 +96,7 @@ def setup(*args):
     ],
 )
 def test_defense_play(simulated_test_runner, blue_bots, yellow_bots):
-    def setup(*args):
+    def setup():
         ball_initial_pos = tbots_cpp.Point(0.9, 2.85)
 
         simulated_test_runner.set_world_state(
@@ -122,7 +121,6 @@ def setup(*args):
 
     simulated_test_runner.run_test(
         setup=setup,
-        params=[0, 1, 2, 3, 4],  # The aggregate test runs 5 times
         always_validation_sequence_set=[
             [
                 BallNeverEntersRegion(

src/software/ai/hl/stp/play/enemy_ball_placement/enemy_ball_placement_play_test.py

@@ -20,7 +20,7 @@
 def test_two_ai_ball_placement(
     simulated_test_runner, ball_start_point, ball_placement_point
 ):
-    def setup(*args):
+    def setup():
         blue_bots = [
             tbots_cpp.Point(-4.5, 0),
             tbots_cpp.Point(-4, 0.5),
@@ -72,7 +72,6 @@ def setup(*args):
 
     simulated_test_runner.run_test(
         setup=setup,
-        params=[0],
         always_validation_sequence_set=always_validation_sequence_set,
         eventually_validation_sequence_set=[[]],
         test_timeout_s=15,

src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py

@@ -97,7 +97,7 @@
 def test_enemy_free_kick_play(
     simulated_test_runner, blue_bots, yellow_bots, ball_initial_pos
 ):
-    def setup(*args):
+    def setup():
         simulated_test_runner.set_world_state(
             create_world_state(
                 yellow_robot_locations=yellow_bots,
@@ -141,7 +141,6 @@ def setup(*args):
 
     simulated_test_runner.run_test(
         setup=setup,
-        params=[0, 1, 2],
         eventually_validation_sequence_set=eventually_validation_sequence_set,
         always_validation_sequence_set=always_validation_sequence_set,
         test_timeout_s=8,

src/software/ai/hl/stp/play/example/example_play_test.py

@@ -13,7 +13,7 @@
 def test_example_play(simulated_test_runner):
     ball_initial_pos = tbots_cpp.Point(0, 0)
 
-    def setup(*args):
+    def setup():
         blue_bots = [
             tbots_cpp.Point(-3, 2.5),
             tbots_cpp.Point(-3, 1.5),

src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py

@@ -30,7 +30,7 @@
     ],
 )
 def test_free_kick_play_friendly(ball_initial_pos, must_score, simulated_test_runner):
-    def setup(*args):
+    def setup():
         blue_bots = [
             tbots_cpp.Point(-4.5, 0),
             tbots_cpp.Point(-3, 1.5),

src/software/ai/hl/stp/play/halt_play/halt_play_test.py

@@ -8,7 +8,7 @@
 # TODO issue  #2599 - Remove Duration parameter from test
 # @pytest.mark.parametrize("run_enemy_ai,test_duration", [(False, 20), (True, 20)])
 def test_halt_play(simulated_test_runner):
-    def setup(*args):
+    def setup():
         ball_initial_pos = tbots_cpp.Point(0, 0)
 
         blue_bots = [
@@ -49,15 +49,11 @@ def setup(*args):
             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
     simulated_test_runner.run_test(
         setup=setup,
-        params=[0],
         always_validation_sequence_set=[[]],
         eventually_validation_sequence_set=[
             [RobotSpeedEventuallyBelowThreshold(1e-3)]
-        ],
-            [RobotSpeedEventuallyBelowThreshold(1e-3)]
         ],
         ci_cmd_with_delay=[
             (3, Command.Type.HALT, Team.BLUE),

src/software/ai/hl/stp/play/kickoff_enemy/kickoff_enemy_play_test.py

@@ -20,7 +20,7 @@ def test_kickoff_enemy_play(simulated_test_runner):
     ball_initial_pos = tbots_cpp.Point(0, 0)
     field = tbots_cpp.Field.createSSLDivisionBField()
 
-    def setup(*args):
+    def setup():
         blue_bots = [
             tbots_cpp.Point(-3, 2.5),
             tbots_cpp.Point(-2.8, 2.5),

src/software/ai/hl/stp/play/kickoff_friendly/kickoff_friendly_play_test.py

@@ -23,7 +23,7 @@
 def test_kickoff_friendly_play(simulated_test_runner):
     ball_initial_pos = tbots_cpp.Point(0, 0)
 
-    def setup(*args):
+    def setup():
         field = tbots_cpp.Field.createSSLDivisionBField()
 
         blue_bots = [