Skip to content

Move pytest validations to its own directory #3639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nycrat merged 20 commits into from
Mar 21, 2026
Merged

Move pytest validations to its own directory #3639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
070e2f8
Move pytest validations to its own directory
nycrat Mar 8, 2026
410f006
Add BUILD
nycrat Mar 8, 2026
8c304fe
Import math
nycrat Mar 8, 2026
d236664
Fix
nycrat Mar 8, 2026
c36740b
Fix
nycrat Mar 8, 2026
d6acb29
Move validation/ to cpp_validation/
nycrat Mar 11, 2026
ab29ff5
Move pytest_validation/ to validation/
nycrat Mar 11, 2026
7bc9b77
Formatting
nycrat Mar 11, 2026
00554dc
Add BUILD
nycrat Mar 11, 2026
1bae6e2
Formatting
nycrat Mar 11, 2026
ced6821
Refactor friendly receives ball slow to be subclass of other validation
nycrat Mar 14, 2026
48d7b1e
Resolve TODO related to delay validation
nycrat Mar 14, 2026
e043d7c
Resolve comment
nycrat Mar 14, 2026
4daf7af
Merge branch 'master' into avah/move_pytests_to_own_directory
nycrat Mar 15, 2026
d6e6747
Fix merge issue
nycrat Mar 15, 2026
35c2011
Remove newly added validations
nycrat Mar 16, 2026
cef0905
Revert changes that aren't related to moving pytest validations
nycrat Mar 16, 2026
b976287
Revert validation.py formatting
nycrat Mar 16, 2026
2f5f892
Tag TODO for incorrect validations
nycrat Mar 16, 2026
511864f
Add specific bazel target for validations
nycrat Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/software/ai/hl/stp/play/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -145,7 +145,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
Expand All @@ -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",
Expand Down Expand Up @@ -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"),
],
)
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/ball_placement/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ py_test(
tags = ["exclusive"],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
Expand Down
6 changes: 4 additions & 2 deletions src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions src/software/ai/hl/stp/play/crease_defense/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
Expand All @@ -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",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/defense/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
Expand Down
4 changes: 2 additions & 2 deletions src/software/ai/hl/stp/play/defense/defense_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/enemy_ball_placement/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ py_test(
tags = ["exclusive"],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/enemy_ball_placement/enemy_ball_placement_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/enemy_free_kick/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
16 changes: 8 additions & 8 deletions src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.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.validation.friendly_team_scored import *
from software.simulated_tests.validation.ball_enters_region import *
from software.simulated_tests.validation.robot_enters_region import (
RobotEventuallyEntersRegion,
RobotNeverEntersRegion,
)
Expand Down Expand Up @@ -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)])]
Expand Down
5 changes: 2 additions & 3 deletions src/software/ai/hl/stp/play/example/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cc_test(
"//shared/test_util:tbots_gtest_main",
"//software/ai/hl/stp/play/example:example_play",
"//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
"//software/simulated_tests/validation:validation_function",
"//software/simulated_tests/cpp_validation:validation_function",
"//software/test_util",
"//software/time:duration",
"//software/world",
Expand All @@ -56,8 +56,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:speed_threshold_helpers",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/example/example_play_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <gtest/gtest.h>

#include "software/simulated_tests/cpp_validation/validation_function.h"
#include "software/simulated_tests/simulated_er_force_sim_play_test_fixture.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"
Expand Down
4 changes: 2 additions & 2 deletions src/software/ai/hl/stp/play/example/example_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import software.python_bindings as tbots_cpp
from software.simulated_tests.robot_enters_region import (
from software.simulated_tests.validation.robot_enters_region import (
NumberOfRobotsEventuallyExitsRegion,
NumberOfRobotsEventuallyEntersRegion,
)
from software.simulated_tests.robot_speed_threshold import *
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
Expand Down
4 changes: 2 additions & 2 deletions src/software/ai/hl/stp/play/free_kick/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cc_test(
"//shared/test_util:tbots_gtest_main",
"//software/ai/hl/stp/play/free_kick:free_kick_play",
"//software/simulated_tests:simulated_er_force_sim_play_test_fixture",
"//software/simulated_tests/validation:validation_function",
"//software/simulated_tests/cpp_validation:validation_function",
"//software/test_util",
"//software/time:duration",
"//software/world",
Expand All @@ -54,7 +54,7 @@ py_test(
tags = ["exclusive"],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/free_kick/free_kick_play_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <gtest/gtest.h>

#include "software/simulated_tests/cpp_validation/validation_function.h"
#include "software/simulated_tests/simulated_er_force_sim_play_test_fixture.h"
#include "software/simulated_tests/validation/validation_function.h"
#include "software/test_util/test_util.h"
#include "software/time/duration.h"
#include "software/world/game_state.h"
Expand Down
9 changes: 5 additions & 4 deletions src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)
Expand Down
3 changes: 1 addition & 2 deletions src/software/ai/hl/stp/play/halt_play/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:speed_threshold_helpers",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/halt_play/halt_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import software.python_bindings as tbots_cpp
from software.simulated_tests.robot_speed_threshold import *
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 software.simulated_tests.simulated_test_fixture import (
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/kickoff_enemy_play_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

#include "software/geom/algorithms/calculate_block_cone.h"
#include "software/geom/algorithms/contains.h"
#include "software/simulated_tests/cpp_validation/validation_function.h"
#include "software/simulated_tests/non_terminating_validation_functions/robots_in_friendly_half_validation.h"
#include "software/simulated_tests/non_terminating_validation_functions/robots_not_in_center_circle_validation.h"
#include "software/simulated_tests/simulated_er_force_sim_play_test_fixture.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"
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/kickoff_friendly_play_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

#include <gtest/gtest.h>

#include "software/simulated_tests/cpp_validation/validation_function.h"
#include "software/simulated_tests/non_terminating_validation_functions/robots_in_friendly_half_validation.h"
#include "software/simulated_tests/non_terminating_validation_functions/robots_not_in_center_circle_validation.h"
#include "software/simulated_tests/simulated_er_force_sim_play_test_fixture.h"
#include "software/simulated_tests/terminating_validation_functions/ball_kicked_validation.h"
#include "software/simulated_tests/terminating_validation_functions/robot_in_center_circle_validation.h"
#include "software/simulated_tests/terminating_validation_functions/robot_in_polygon_validation.h"
#include "software/simulated_tests/terminating_validation_functions/robot_received_ball_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"
Expand Down
13 changes: 7 additions & 6 deletions src/software/ai/hl/stp/play/kickoff_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.robot_enters_region import *
from software.simulated_tests.validation.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.validation.or_validation import OrValidation


@pytest.mark.parametrize("is_friendly_test", [True, False])
Expand Down Expand Up @@ -77,11 +76,13 @@ def setup(*args):
simulated_test_runner.set_play(blue_play, is_friendly=True)
simulated_test_runner.set_play(yellow_play, is_friendly=False)

# TODO (#3650): fix validation logic

# 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)]
)
Comment on lines -83 to 86

@nycrat nycrat Mar 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: If you look at the old validation logic for BallMovesFromRest, it does the same thing of checking if ball is within a radius to an initial position. That specific validation is not used anywhere else, so it has been removed in this PR


expected_center_circle_or_validation_set = [
Expand Down
2 changes: 1 addition & 1 deletion src/software/ai/hl/stp/play/offense/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ py_test(
],
deps = [
"//software:conftest",
"//software/simulated_tests:validation",
"//software/simulated_tests/validation:validations",
requirement("pytest"),
],
)
9 changes: 4 additions & 5 deletions src/software/ai/hl/stp/play/offense/offense_play_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.validation.friendly_team_scored import *
from software.simulated_tests.validation.ball_enters_region import *
from software.simulated_tests.validation.friendly_has_ball_possession import *
from software.simulated_tests.validation.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 (
Expand Down
Loading
Loading