Move pytest validations to its own directory (#3639)

* Move pytest validations to its own directory

* Add BUILD

* Import math

* Fix

* Fix

* Move validation/ to cpp_validation/

* Move pytest_validation/ to validation/

* Formatting

* Add BUILD

* Formatting

* Refactor friendly receives ball slow to be subclass of other validation

* Resolve TODO related to delay validation

* Resolve comment

* Fix merge issue

* Remove newly added validations

* Revert changes that aren't related to moving pytest validations

* Revert validation.py formatting

* Tag TODO for incorrect validations

* Add specific bazel target for validations

Author: nycrat

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

@@ -108,9 +108,9 @@ cc_test(
         "//shared/test_util:tbots_gtest_main",
         "//software/ai/hl/stp/play:kickoff_friendly_play",
         "//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
+        "//software/simulated_tests/cpp_validation:validation_function",
         "//software/simulated_tests/non_terminating_validation_functions",
         "//software/simulated_tests/terminating_validation_functions",
-        "//software/simulated_tests/validation:validation_function",
         "//software/test_util",
         "//software/time:duration",
         "//software/world",
@@ -125,9 +125,9 @@ cc_test(
         "//software/ai/hl/stp/play:kickoff_enemy_play",
         "//software/geom/algorithms",
         "//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
+        "//software/simulated_tests/cpp_validation:validation_function",
         "//software/simulated_tests/non_terminating_validation_functions",
         "//software/simulated_tests/terminating_validation_functions",
-        "//software/simulated_tests/validation:validation_function",
         "//software/test_util",
         "//software/time:duration",
         "//software/world",
@@ -145,7 +145,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/validation:validations",
         requirement("pytest"),
     ],
 )
@@ -157,8 +157,8 @@ cc_test(
         "//shared/test_util:tbots_gtest_main",
         "//software/ai/hl/stp/play:stop_play",
         "//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
+        "//software/simulated_tests/cpp_validation:validation_function",
         "//software/simulated_tests/non_terminating_validation_functions",
-        "//software/simulated_tests/validation:validation_function",
         "//software/test_util",
         "//software/time:duration",
         "//software/world",
@@ -216,7 +216,7 @@ py_test(
         "//proto:software_py_proto",
         "//proto:tbots_py_proto",
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/validation: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/validation: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.validation.ball_enters_region import (
     BallAlwaysStaysInRegion,
     BallEventuallyEntersRegion,
 )
-from software.simulated_tests.robot_enters_region import RobotEventuallyExitsRegion
+from software.simulated_tests.validation.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/validation:validations",
         requirement("pytest"),
     ],
 )
@@ -51,9 +51,9 @@ cc_test(
         ":crease_defense_play",
         "//shared/test_util:tbots_gtest_main",
         "//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
+        "//software/simulated_tests/cpp_validation:validation_function",
         "//software/simulated_tests/non_terminating_validation_functions",
         "//software/simulated_tests/terminating_validation_functions",
-        "//software/simulated_tests/validation:validation_function",
         "//software/test_util",
     ],
 )

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

@@ -2,11 +2,11 @@
 
 #include <gtest/gtest.h>
 
+#include "software/simulated_tests/cpp_validation/validation_function.h"
 #include "software/simulated_tests/non_terminating_validation_functions/ball_in_play_or_scored_validation.h"
 #include "software/simulated_tests/simulated_er_force_sim_play_test_fixture.h"
 #include "software/simulated_tests/terminating_validation_functions/robot_halt_validation.h"
 #include "software/simulated_tests/terminating_validation_functions/robot_in_polygon_validation.h"
-#include "software/simulated_tests/validation/validation_function.h"
 #include "software/test_util/test_util.h"
 #include "software/time/duration.h"
 #include "software/world/world.h"

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

@@ -42,7 +42,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests:validation",
+        "//software/simulated_tests/validation: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.validation.ball_enters_region import *
+from software.simulated_tests.validation.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/validation: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.validation.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/validation:validations",
         requirement("pytest"),
     ],
 )