Reduce boilerplate for setting tactics and plays in tests

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

@@ -134,15 +134,9 @@ def ball_placement_play_setup(
     )
 
     # Force play override here
-    blue_play = Play()
-    blue_play.name = PlayName.BallPlacementPlay
-
-    yellow_play = Play()
-    yellow_play.name = PlayName.HaltPlay
-
-    simulated_test_runner.set_play(blue_play, is_friendly=True)
-    if not blue_only:
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+    simulated_test_runner.set_plays(
+        blue_play=PlayName.BallPlacementPlay, yellow_play=PlayName.HaltPlay
+    )
 
 
 def run_ball_placement_scenario(

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

@@ -1,5 +1,5 @@
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from proto.import_all_protos import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
@@ -50,14 +50,9 @@ def setup(*args):
             gc_command=Command.Type.FORCE_START, team=Team.BLUE
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.CreaseDefensePlay
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.HaltPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.CreaseDefensePlay, yellow_play=PlayName.HaltPlay
+        )
 
     # TODO (#2778): actually add validations
     always_validation_sequence_set = [[]]

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

@@ -1,7 +1,7 @@
 import pytest
 
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.validation.ball_enters_region import *
 from software.simulated_tests.validation.friendly_has_ball_possession import (
     FriendlyEventuallyHasBallPossession,
@@ -55,13 +55,9 @@ def setup(*args):
             gc_command=Command.Type.FORCE_START, team=Team.BLUE
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.DefensePlay
-
-        params = AssignedTacticPlayControlParams()
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_tactics(params, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.DefensePlay, yellow_play=PlayName.HaltPlay
+        )
 
     simulated_test_runner.run_test(
         setup=setup,
@@ -124,14 +120,9 @@ def setup(*args):
             gc_command=Command.Type.FORCE_START, team=Team.BLUE
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.DefensePlay
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.ShootOrPassPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.DefensePlay, yellow_play=PlayName.ShootOrPassPlay
+        )
 
     simulated_test_runner.run_test(
         setup=setup,

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

@@ -1,7 +1,7 @@
 import pytest
 
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.validation.robot_enters_placement_region import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
@@ -63,15 +63,10 @@ def setup(*args):
             final_ball_placement_point=ball_placement_point,
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.EnemyBallPlacementPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.BallPlacementPlay
-
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.EnemyBallPlacementPlay,
+            yellow_play=PlayName.BallPlacementPlay,
+        )
 
     always_validation_sequence_set = [
         [RobotNeverEntersPlacementRegion(ball_placement_point)]

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

@@ -1,7 +1,7 @@
 import pytest
 
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 
 from software.simulated_tests.validation.or_validation import OrValidation
 
@@ -116,14 +116,9 @@ def setup(*args):
             gc_command=Command.Type.DIRECT, team=Team.YELLOW
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.EnemyFreeKickPlay
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.FreeKickPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.EnemyFreeKickPlay, yellow_play=PlayName.FreeKickPlay
+        )
 
     # Always Validation
     always_validation_sequence_set = [

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

@@ -6,7 +6,7 @@
 from software.simulated_tests.validation.robot_speed_threshold import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )
@@ -47,14 +47,9 @@ def setup(*args):
             ),
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.ExamplePlay
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.HaltPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.ExamplePlay, yellow_play=PlayName.HaltPlay
+        )
 
         simulated_test_runner.send_gamecontroller_command(
             gc_command=Command.Type.STOP, team=Team.UNKNOWN

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

@@ -3,7 +3,7 @@
 
 from proto.import_all_protos import *
 
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from proto.ssl_gc_common_pb2 import Team
 
 from proto.message_translation.tbots_protobuf import create_world_state
@@ -34,14 +34,7 @@ def free_kick_play_setup(
         gc_command=Command.Type.DIRECT, team=Team.BLUE
     )
 
-    blue_play = Play()
-    blue_play.name = play_name
-
-    yellow_play = Play()
-    yellow_play.name = PlayName.HaltPlay
-
-    simulated_test_runner.set_play(blue_play, is_friendly=True)
-    simulated_test_runner.set_play(yellow_play, is_friendly=False)
+    simulated_test_runner.set_plays(blue_play=play_name, yellow_play=PlayName.HaltPlay)
 
 
 # We want to test friendly half, enemy half, and at the border of the field

src/software/ai/hl/stp/play/kickoff_play_test.py

@@ -1,7 +1,7 @@
 import pytest
 
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.validation.robot_enters_region import *
 from software.simulated_tests.validation.ball_enters_region import *
 from proto.import_all_protos import *
@@ -49,9 +49,6 @@ def setup(*args):
             ),
         )
 
-        blue_play = Play()
-        yellow_play = Play()
-
         simulated_test_runner.send_gamecontroller_command(
             gc_command=Command.Type.STOP, team=Team.UNKNOWN
         )
@@ -60,21 +57,22 @@ def setup(*args):
             simulated_test_runner.send_gamecontroller_command(
                 gc_command=Command.Type.KICKOFF, team=Team.BLUE
             )
-            blue_play.name = PlayName.KickoffFriendlyPlay
-            yellow_play.name = PlayName.KickoffEnemyPlay
+            blue_play = PlayName.KickoffFriendlyPlay
+            yellow_play = PlayName.KickoffEnemyPlay
         else:
             simulated_test_runner.send_gamecontroller_command(
                 gc_command=Command.Type.KICKOFF, team=Team.YELLOW
             )
-            blue_play.name = PlayName.KickoffEnemyPlay
-            yellow_play.name = PlayName.KickoffFriendlyPlay
+            blue_play = PlayName.KickoffEnemyPlay
+            yellow_play = PlayName.KickoffFriendlyPlay
 
         simulated_test_runner.send_gamecontroller_command(
             gc_command=Command.Type.NORMAL_START, team=Team.BLUE
         )
 
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(blue_play=blue_play, yellow_play=yellow_play)
+
+    # TODO (#3650): fix validation logic
 
     # TODO (#3650): fix validation logic
 

src/software/ai/hl/stp/play/offense/offense_play_test.py

@@ -1,5 +1,5 @@
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.validation.friendly_team_scored import *
 from software.simulated_tests.validation.ball_enters_region import *
 from software.simulated_tests.validation.friendly_has_ball_possession import *
@@ -53,14 +53,9 @@ def setup(start_point):
             gc_command=Command.Type.FORCE_START, team=Team.BLUE
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.OffensePlay
-
-        yellow_play = Play()
-        yellow_play.name = PlayName.HaltPlay
-
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
-        simulated_test_runner.set_play(yellow_play, is_friendly=False)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.OffensePlay, yellow_play=PlayName.HaltPlay
+        )
 
     field = tbots_cpp.Field.createSSLDivisionBField()
 

src/software/ai/hl/stp/play/passing_sim_test.py

@@ -110,16 +110,14 @@ def setup_pass_and_robots(
     # Setup the passer's tactic
     # We use KickTactic since AttackerTactic shoots towards the goal instead if open
     # KickTactic just does the kick we want
-    params = AssignedTacticPlayControlParams()
-    params.assigned_tactics[0].kick.CopyFrom(
-        KickTactic(
-            kick_origin=Point(
-                x_meters=best_pass.passerPoint().x(),
-                y_meters=best_pass.passerPoint().y(),
-            ),
-            kick_direction=Angle(radians=kick_vec.orientation().toRadians()),
-            kick_speed_meters_per_second=best_pass.speed(),
-        )
+    blue_tactics = {}
+    blue_tactics[0] = KickTactic(
+        kick_origin=Point(
+            x_meters=best_pass.passerPoint().x(),
+            y_meters=best_pass.passerPoint().y(),
+        ),
+        kick_direction=Angle(radians=kick_vec.orientation().toRadians()),
+        kick_speed_meters_per_second=best_pass.speed(),
     )
 
     # if we want a friendly robot to receive the pass
@@ -140,12 +138,9 @@ def setup_pass_and_robots(
             "disable_one_touch_shot": True,
         }
 
-        params.assigned_tactics[1].receiver.CopyFrom(ReceiverTactic(**receiver_args))
-    simulated_test_runner.set_tactics(params, True)
+        blue_tactics[1] = ReceiverTactic(**receiver_args)
 
-    # Setup no tactics on the enemy side
-    params = AssignedTacticPlayControlParams()
-    simulated_test_runner.set_tactics(params, False)
+    simulated_test_runner.set_tactics(blue_tactics=blue_tactics, yellow_tactics=None)
 
     return best_pass
 

src/software/ai/hl/stp/play/shoot_or_chip/shoot_or_chip_play_test.py

@@ -2,7 +2,7 @@
 
 
 import software.python_bindings as tbots_cpp
-from proto.play_pb2 import Play, PlayName
+from proto.play_pb2 import PlayName
 from software.simulated_tests.validation.ball_enters_region import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
@@ -61,10 +61,11 @@ def setup(*args):
             gc_command=Command.Type.FORCE_START, team=Team.BLUE
         )
 
-        blue_play = Play()
-        blue_play.name = PlayName.ShootOrChipPlay
-        simulated_test_runner.set_play(blue_play, is_friendly=True)
+        simulated_test_runner.set_plays(
+            blue_play=PlayName.ShootOrChipPlay, yellow_play=PlayName.UseAiSelection
+        )
 
+    # TODO (#3651): create validations
     simulated_test_runner.run_test(
         setup=setup,
         # this array is just so that the test runs 5 times