Move pytest validations to its own directory

Author: nycrat

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)])]