From 659bfb9159c2c98e63e3c7b74b745d2dab1cf864 Mon Sep 17 00:00:00 2001 From: Sokwhan Huh Date: Mon, 1 Jun 2026 14:41:53 -0700 Subject: [PATCH] Remove duplicate policy tests that's already covered by conformance tests PiperOrigin-RevId: 924921276 --- .../dev/cel/testing/testrunner/BUILD.bazel | 107 ------------------ testing/testrunner/cel_java_test.bzl | 2 +- 2 files changed, 1 insertion(+), 108 deletions(-) diff --git a/testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel b/testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel index 69c53e5d9..9141832cb 100644 --- a/testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel +++ b/testing/src/test/java/dev/cel/testing/testrunner/BUILD.bazel @@ -155,33 +155,6 @@ java_test( ], ) -cel_java_test( - name = "test_runner_sample_yaml", - cel_expr = "@cel_policy//conformance:testdata/nested_rule/policy.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_src = ":user_test", - test_suite = "@cel_policy//conformance:testdata/nested_rule/tests.yaml", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - -cel_java_test( - name = "unknown_set_yaml", - cel_expr = "@cel_policy//conformance:testdata/nested_rule/policy.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_data_path = "//testing/src/test/resources/policy", - test_src = ":user_test", - test_suite = "nested_rule/testrunner_unknown_output_tests.yaml", -) - cel_java_test( name = "custom_variable_binding_test_runner_sample", cel_expr = "custom_variable_bindings/policy.yaml", @@ -208,53 +181,6 @@ cel_java_test( test_suite = "nested_rule/eval_error_tests.yaml", ) -cel_java_test( - name = "context_pb_user_test_runner_sample", - cel_expr = "@cel_policy//conformance:testdata/context_pb/policy.yaml", - config = "@cel_policy//conformance:testdata/context_pb/config.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_src = ":context_pb_user_test", - test_suite = "@cel_policy//conformance:testdata/context_pb/tests.yaml", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - -cel_java_test( - name = "additional_config_test_runner_sample", - cel_expr = "@cel_policy//conformance:testdata/nested_rule/policy.yaml", - config = "@cel_policy//conformance:testdata/nested_rule/config.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_src = ":env_config_user_test", - test_suite = "@cel_policy//conformance:testdata/nested_rule/tests.textproto", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - -cel_java_test( - name = "test_runner_sample", - cel_expr = "@cel_policy//conformance:testdata/nested_rule/policy.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_src = ":user_test", - test_suite = "@cel_policy//conformance:testdata/nested_rule/tests.textproto", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - cel_java_test( name = "test_runner_sample_with_expr_value_output", cel_expr = "expr_value_output/policy.yaml", @@ -280,39 +206,6 @@ cel_java_test( ], ) -cel_java_test( - name = "context_message_user_test_runner_textproto_sample", - cel_expr = "@cel_policy//conformance:testdata/context_pb/policy.yaml", - config = "@cel_policy//conformance:testdata/context_pb/config.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_data_path = "//testing/src/test/resources/policy", - test_src = ":context_pb_user_test", - test_suite = "context_pb/context_msg_tests.textproto", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - -cel_java_test( - name = "context_pb_user_test_runner_textproto_sample", - cel_expr = "@cel_policy//conformance:testdata/context_pb/policy.yaml", - config = "@cel_policy//conformance:testdata/context_pb/config.yaml", - proto_deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", - ], - test_src = ":context_pb_user_test", - test_suite = "@cel_policy//conformance:testdata/context_pb/tests.textproto", - deps = [ - "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto", - "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto", - ], -) - cel_java_test( name = "raw_expression_test", cel_expr = "2 + 2 == 4", diff --git a/testing/testrunner/cel_java_test.bzl b/testing/testrunner/cel_java_test.bzl index 450b62af3..d2dd796c0 100644 --- a/testing/testrunner/cel_java_test.bzl +++ b/testing/testrunner/cel_java_test.bzl @@ -21,7 +21,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library") def _is_label(s): - return s.startswith("//") or s.startswith(":") or s.startswith("@") + return s.startswith("//") or s.startswith(":") def cel_java_test( name,