Move pytest validations to its own directory

src/software/ai/hl/stp/play/BUILD

@@ -169,7 +169,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )
@@ -214,7 +214,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )
@@ -270,7 +270,7 @@ py_test(
         "//proto:software_py_proto",
         "//proto:tbots_py_proto",
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/play/ball_placement/BUILD

@@ -40,7 +40,7 @@ py_test(
     tags = ["exclusive"],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -5,11 +5,13 @@
 from proto.import_all_protos import *
 from proto.ssl_gc_common_pb2 import Team
 from proto.message_translation.tbots_protobuf import create_world_state
-from software.simulated_tests.ball_enters_region import (
+from software.simulated_tests.pytest_validations.ball_enters_region import (
     BallAlwaysStaysInRegion,
     BallEventuallyEntersRegion,
 )
-from software.simulated_tests.robot_enters_region import RobotEventuallyExitsRegion
+from software.simulated_tests.pytest_validations.robot_enters_region import (
+    RobotEventuallyExitsRegion,
+)
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )

src/software/ai/hl/stp/play/crease_defense/BUILD

@@ -39,7 +39,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/play/defense/BUILD

@@ -42,7 +42,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -2,8 +2,8 @@
 
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.friendly_has_ball_possession import (
+from software.simulated_tests.pytest_validations.ball_enters_region import *
+from software.simulated_tests.pytest_validations.friendly_has_ball_possession import (
     FriendlyEventuallyHasBallPossession,
 )
 from proto.message_translation.tbots_protobuf import create_world_state

src/software/ai/hl/stp/play/enemy_ball_placement/BUILD

@@ -31,7 +31,7 @@ py_test(
     tags = ["exclusive"],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -2,7 +2,7 @@
 
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
-from software.simulated_tests.robot_enters_placement_region import *
+from software.simulated_tests.pytest_validations.robot_enters_placement_region import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )

src/software/ai/hl/stp/play/enemy_free_kick/BUILD

@@ -45,7 +45,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -3,14 +3,11 @@
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
 
-from software.simulated_tests.or_validation import OrValidation
+from software.simulated_tests.pytest_validations.or_validation import OrValidation
 
-from software.simulated_tests.ball_moves_from_rest import (
-    BallEventuallyMovesFromRest,
-)
-from software.simulated_tests.friendly_team_scored import *
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.robot_enters_region import (
+from software.simulated_tests.pytest_validations.friendly_team_scored import *
+from software.simulated_tests.pytest_validations.ball_enters_region import *
+from software.simulated_tests.pytest_validations.robot_enters_region import (
     RobotEventuallyEntersRegion,
     RobotNeverEntersRegion,
 )
@@ -136,11 +133,14 @@ def setup(*args):
                     RobotNeverEntersRegion(
                         regions=[tbots_cpp.Circle(ball_initial_pos, 0.05)]
                     ),
-                    BallEventuallyMovesFromRest(position=ball_initial_pos),
+                    BallEventuallyExitsRegion(
+                        regions=[tbots_cpp.Circle(ball_initial_pos, 0.05)]
+                    ),
                 ]
             )
         ]
     ]
+
     # Eventually Validation
     eventually_validation_sequence_set = [
         [RobotEventuallyEntersRegion(regions=[tbots_cpp.Circle(ball_initial_pos, 1)])]

src/software/ai/hl/stp/play/example/BUILD

@@ -56,8 +56,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:speed_threshold_helpers",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -1,9 +1,9 @@
 import software.python_bindings as tbots_cpp
-from software.simulated_tests.robot_enters_region import (
+from software.simulated_tests.pytest_validations.robot_enters_region import (
     NumberOfRobotsEventuallyExitsRegion,
     NumberOfRobotsEventuallyEntersRegion,
 )
-from software.simulated_tests.robot_speed_threshold import *
+from software.simulated_tests.pytest_validations.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

src/software/ai/hl/stp/play/free_kick/BUILD

@@ -54,7 +54,7 @@ py_test(
     tags = ["exclusive"],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -1,11 +1,12 @@
 import pytest
-
 import software.python_bindings as tbots_cpp
+
+from proto.import_all_protos import *
+
 from proto.play_pb2 import Play, PlayName
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.friendly_team_scored import *
-from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
+
+from proto.message_translation.tbots_protobuf import create_world_state
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )

src/software/ai/hl/stp/play/halt_play/BUILD

@@ -43,8 +43,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:speed_threshold_helpers",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -1,5 +1,5 @@
 import software.python_bindings as tbots_cpp
-from software.simulated_tests.robot_speed_threshold import *
+from software.simulated_tests.pytest_validations.robot_speed_threshold import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
 from software.simulated_tests.simulated_test_fixture import (

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

@@ -2,16 +2,15 @@
 
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
-from software.simulated_tests.robot_enters_region import *
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.ball_moves_from_rest import *
+from software.simulated_tests.pytest_validations.robot_enters_region import *
+from software.simulated_tests.pytest_validations.ball_enters_region import *
 from proto.import_all_protos import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )
-from software.simulated_tests.or_validation import OrValidation
+from software.simulated_tests.pytest_validations.or_validation import OrValidation
 
 
 @pytest.mark.parametrize("is_friendly_test", [True, False])
@@ -80,8 +79,8 @@ def setup(*args):
     # Always Validation
     always_validation_sequence_set = [[]]
 
-    ball_moves_at_rest_validation = BallAlwaysMovesFromRest(
-        position=tbots_cpp.Point(0, 0), threshold=0.05
+    ball_moves_at_rest_validation = BallNeverEntersRegion(
+        regions=[tbots_cpp.Circle(tbots_cpp.Point(0, 0), 0.05)]
     )
 
     expected_center_circle_or_validation_set = [

src/software/ai/hl/stp/play/offense/BUILD

@@ -39,7 +39,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

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

@@ -1,10 +1,9 @@
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
-
-from software.simulated_tests.excessive_dribbling import NeverExcessivelyDribbles
-from software.simulated_tests.friendly_team_scored import *
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.friendly_has_ball_possession import *
+from software.simulated_tests.pytest_validations.friendly_team_scored import *
+from software.simulated_tests.pytest_validations.ball_enters_region import *
+from software.simulated_tests.pytest_validations.friendly_has_ball_possession import *
+from software.simulated_tests.pytest_validations.excessive_dribbling import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
 from software.simulated_tests.simulated_test_fixture import (

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

@@ -1,19 +1,21 @@
 import pytest
-import math
 import software.python_bindings as tbots_cpp
+import math
 from proto.import_all_protos import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )
 from proto.message_translation.tbots_protobuf import create_world_state
-from software.simulated_tests.friendly_receives_ball_slow import (
+from software.simulated_tests.pytest_validations.friendly_receives_ball_slow import (
     FriendlyAlwaysReceivesBallSlow,
 )
-from software.simulated_tests.friendly_has_ball_possession import (
+from software.simulated_tests.pytest_validations.friendly_has_ball_possession import (
     FriendlyEventuallyHasBallPossession,
 )
-from software.simulated_tests.ball_moves_in_direction import BallMovesForwardInRegions
-from software.simulated_tests.ball_enters_region import (
+from software.simulated_tests.pytest_validations.ball_moves_in_direction import (
+    BallMovesForwardInRegions,
+)
+from software.simulated_tests.pytest_validations.ball_enters_region import (
     BallEventuallyExitsRegion,
     BallEventuallyEntersRegion,
 )

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

@@ -3,7 +3,7 @@
 
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import Play, PlayName
-from software.simulated_tests.ball_enters_region import *
+from software.simulated_tests.pytest_validations.ball_enters_region import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )

src/software/ai/hl/stp/tactic/crease_defender/BUILD

@@ -59,8 +59,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:speed_threshold_helpers",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic_test.py

@@ -1,18 +1,28 @@
 import pytest
-
 import software.python_bindings as tbots_cpp
-from software.simulated_tests.robot_enters_region import *
-from software.simulated_tests.ball_enters_region import *
-from software.simulated_tests.ball_moves_in_direction import *
-from software.simulated_tests.friendly_has_ball_possession import *
-from software.simulated_tests.ball_speed_threshold import *
-from software.simulated_tests.robot_speed_threshold import *
-from software.simulated_tests.excessive_dribbling import *
+
+from proto.import_all_protos import (
+    BallStealMode,
+    CreaseDefenderAlignment,
+    CreaseDefenderTactic,
+    MaxAllowedSpeedMode,
+)
+from proto.message_translation.tbots_protobuf import create_world_state
+from software.simulated_tests.pytest_validations.ball_is_off_ground import (
+    BallIsAlwaysOnGround,
+    BallIsEventuallyOffGround,
+)
+from software.simulated_tests.pytest_validations.excessive_dribbling import (
+    NeverExcessivelyDribbles,
+)
+from software.simulated_tests.pytest_validations.robot_enters_region import (
+    RobotEventuallyEntersRegion,
+    RobotNeverEntersRegion,
+)
+from proto.import_all_protos import *
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )
-from software.simulated_tests.ball_is_off_ground import *
-from proto.message_translation.tbots_protobuf import create_world_state
 
 
 @pytest.mark.parametrize(

src/software/ai/hl/stp/tactic/dribble/BUILD

@@ -74,8 +74,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:speed_threshold_helpers",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/tactic/dribble/excessive_dribble_test.py

@@ -1,19 +1,15 @@
 import pytest
-
 import software.python_bindings as tbots_cpp
-from software.simulated_tests.excessive_dribbling import (
-    NeverExcessivelyDribbles,
+
+from proto.import_all_protos import *
+from proto.message_translation.tbots_protobuf import DribbleTactic, create_world_state
+from software.simulated_tests.pytest_validations.excessive_dribbling import (
     EventuallyStartsExcessivelyDribbling,
-)
-from proto.message_translation.tbots_protobuf import (
-    WorldState,
-    AssignedTacticPlayControlParams,
-    DribbleTactic,
+    NeverExcessivelyDribbles,
 )
 from software.simulated_tests.simulated_test_fixture import (
     pytest_main,
 )
-from proto.message_translation.tbots_protobuf import create_world_state
 
 
 @pytest.mark.parametrize(

src/software/ai/hl/stp/tactic/goalie/BUILD

@@ -58,8 +58,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:speed_threshold_helpers",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/pytest_validations:all_validations",
         requirement("pytest"),
     ],
 )