From 74de9acd4b51c82fc5222e83074b59d92812e741 Mon Sep 17 00:00:00 2001 From: Sean Huh Date: Wed, 11 Nov 2026 09:15:02 -0800 Subject: [PATCH] Switch CEL-C++ conformance tests and test protos to depend on cel-conformance repository PiperOrigin-RevId: 1019249984 --- MODULE.bazel | 11 +++ checker/internal/BUILD | 4 +- checker/internal/type_checker_impl_test.cc | 4 +- common/BUILD | 6 +- common/format_type_name_test.cc | 2 +- common/value_test.cc | 4 +- common/values/legacy_struct_value_test.cc | 2 +- common/values/message_value_test.cc | 2 +- common/values/parsed_json_list_value_test.cc | 2 +- common/values/parsed_json_map_value_test.cc | 2 +- common/values/parsed_json_value_test.cc | 2 +- common/values/parsed_map_field_value_test.cc | 2 +- common/values/parsed_message_value_test.cc | 2 +- .../parsed_repeated_field_value_test.cc | 2 +- common/values/struct_value_test.cc | 2 +- compiler/BUILD | 2 +- compiler/optional_test.cc | 2 +- conformance/BUILD | 68 +++++++++---------- conformance/policy/BUILD | 2 +- conformance/policy/policy_conformance_test.cc | 2 +- conformance/run.cc | 2 +- conformance/service.cc | 6 +- eval/compiler/BUILD | 4 +- .../cel_expression_builder_flat_impl_test.cc | 2 +- eval/compiler/flat_expr_builder_test.cc | 2 +- eval/eval/BUILD | 2 +- eval/eval/select_step_test.cc | 2 +- eval/public/containers/BUILD | 2 +- eval/public/containers/field_access_test.cc | 2 +- eval/public/structs/BUILD | 6 +- ...dynamic_descriptor_pool_end_to_end_test.cc | 2 +- .../field_access_impl_benchmark_test.cc | 2 +- eval/public/structs/field_access_impl_test.cc | 2 +- extensions/BUILD | 8 +-- extensions/bindings_ext_test.cc | 2 +- extensions/formatting_test.cc | 2 +- extensions/protobuf/BUILD | 8 +-- .../protobuf/bind_proto_to_activation_test.cc | 2 +- extensions/protobuf/value_end_to_end_test.cc | 2 +- extensions/protobuf/value_test.cc | 2 +- extensions/protobuf/value_testing_test.cc | 2 +- extensions/select_optimization_test.cc | 2 +- .../set_membership_optimization_test.cc | 2 +- internal/BUILD | 10 +-- internal/json_test.cc | 2 +- internal/message_equality_test.cc | 2 +- internal/well_known_types_test.cc | 2 +- policy/BUILD | 2 +- runtime/BUILD | 6 +- runtime/bind_proto_to_activation_test.cc | 2 +- runtime/internal/BUILD | 2 +- .../legacy_runtime_type_provider_test.cc | 2 +- runtime/memory_safety_test.cc | 2 +- .../optimized_runtime_builder_factory_test.cc | 2 +- testing/testrunner/BUILD | 12 ++-- testing/testrunner/cel_test_context.h | 2 +- testing/testrunner/cel_test_factories.h | 2 +- .../resources/simple_tests.textproto | 2 +- testing/testrunner/runner_bin.cc | 2 +- testing/testrunner/runner_lib.cc | 2 +- testing/testrunner/runner_lib.h | 2 +- testing/testrunner/runner_lib_test.cc | 4 +- testing/testrunner/user_tests/BUILD | 6 +- .../user_tests/checked_expr_test.cc | 2 +- .../user_tests/raw_expr_and_cel_file_test.cc | 2 +- .../user_tests/raw_expression_test.cc | 2 +- testutil/BUILD | 2 +- tools/BUILD | 2 +- tools/descriptor_pool_builder_test.cc | 2 +- 69 files changed, 142 insertions(+), 131 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d6ac0cb81..3434f1cbe 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -67,6 +67,17 @@ git_override( commit = "6dccde40b346f89761ddb890abc6ca503a453134", remote = "https://github.com/cel-expr/cel-spec", ) +bazel_dep( + name = "cel-conformance", + version = "0.1.0", + repo_name = "cel_conformance", +) +# TODO(b/582952496): Remove git_override once cel-conformance is published on BCR. +git_override( + module_name = "cel-conformance", + commit = "8d64ec2a2938204e388fc02e8e5102dc8ca16e83", + remote = "https://github.com/cel-expr/cel-conformance", +) bazel_dep( name = "platforms", diff --git a/checker/internal/BUILD b/checker/internal/BUILD index 7b118b657..608081563 100644 --- a/checker/internal/BUILD +++ b/checker/internal/BUILD @@ -201,6 +201,8 @@ cc_test( "//parser:macro_registry", "//testutil:baseline_tests", "//testutil:test_macros", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/container:flat_hash_set", @@ -209,8 +211,6 @@ cc_test( "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/checker/internal/type_checker_impl_test.cc b/checker/internal/type_checker_impl_test.cc index e12500ce8..2caf25eae 100644 --- a/checker/internal/type_checker_impl_test.cc +++ b/checker/internal/type_checker_impl_test.cc @@ -30,6 +30,8 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "checker/checker_options.h" #include "checker/internal/test_ast_helpers.h" #include "checker/internal/type_check_env.h" @@ -52,8 +54,6 @@ #include "parser/parser.h" #include "testutil/baseline_tests.h" #include "testutil/test_macros.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" diff --git a/common/BUILD b/common/BUILD index c3a91034b..f5ca6251f 100644 --- a/common/BUILD +++ b/common/BUILD @@ -714,7 +714,7 @@ cc_test( ":format_type_name", ":type", "//internal:testing", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -842,6 +842,8 @@ cc_test( "//internal:testing_message_factory", "//runtime:runtime_options", "//runtime/internal:errors", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/functional:function_ref", @@ -856,8 +858,6 @@ cc_test( "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/time", "@com_google_absl//absl/types:optional", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:field_mask_cc_proto", "@com_google_protobuf//:protobuf", "@com_google_protobuf//:struct_cc_proto", diff --git a/common/format_type_name_test.cc b/common/format_type_name_test.cc index ca63f60b0..088d0fc7d 100644 --- a/common/format_type_name_test.cc +++ b/common/format_type_name_test.cc @@ -14,9 +14,9 @@ #include "common/format_type_name.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "common/type.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel { diff --git a/common/value_test.cc b/common/value_test.cc index 56cd5252b..0b11c4948 100644 --- a/common/value_test.cc +++ b/common/value_test.cc @@ -22,14 +22,14 @@ #include "absl/status/status.h" #include "absl/status/status_matchers.h" #include "absl/types/optional.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/type.h" #include "common/value_testing.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" diff --git a/common/values/legacy_struct_value_test.cc b/common/values/legacy_struct_value_test.cc index 1329232f8..3ce23ba5a 100644 --- a/common/values/legacy_struct_value_test.cc +++ b/common/values/legacy_struct_value_test.cc @@ -22,6 +22,7 @@ #include "absl/status/status.h" #include "absl/status/status_matchers.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/legacy_value.h" #include "common/value.h" #include "common/value_testing.h" @@ -31,7 +32,6 @@ #include "eval/public/structs/proto_message_type_adapter.h" #include "internal/testing.h" #include "runtime/runtime_options.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" namespace cel { namespace { diff --git a/common/values/message_value_test.cc b/common/values/message_value_test.cc index 2e3a8e711..48ea6a934 100644 --- a/common/values/message_value_test.cc +++ b/common/values/message_value_test.cc @@ -17,13 +17,13 @@ #include "absl/status/status_matchers.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "base/attribute.h" #include "common/type.h" #include "common/value.h" #include "common/value_kind.h" #include "common/value_testing.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" namespace cel { diff --git a/common/values/parsed_json_list_value_test.cc b/common/values/parsed_json_list_value_test.cc index 7551463f4..404fb76ca 100644 --- a/common/values/parsed_json_list_value_test.cc +++ b/common/values/parsed_json_list_value_test.cc @@ -22,6 +22,7 @@ #include "absl/status/status_matchers.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/memory.h" #include "common/type.h" #include "common/value.h" @@ -29,7 +30,6 @@ #include "common/value_testing.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" diff --git a/common/values/parsed_json_map_value_test.cc b/common/values/parsed_json_map_value_test.cc index 8dfca0c70..6c6199c88 100644 --- a/common/values/parsed_json_map_value_test.cc +++ b/common/values/parsed_json_map_value_test.cc @@ -21,13 +21,13 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/memory.h" #include "common/type.h" #include "common/value.h" #include "common/value_kind.h" #include "common/value_testing.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" namespace cel { diff --git a/common/values/parsed_json_value_test.cc b/common/values/parsed_json_value_test.cc index 7a6fbf5d4..d908744f1 100644 --- a/common/values/parsed_json_value_test.cc +++ b/common/values/parsed_json_value_test.cc @@ -16,9 +16,9 @@ #include "google/protobuf/struct.pb.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/value_testing.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" namespace cel::common_internal { namespace { diff --git a/common/values/parsed_map_field_value_test.cc b/common/values/parsed_map_field_value_test.cc index f605b5c98..9da3ff84e 100644 --- a/common/values/parsed_map_field_value_test.cc +++ b/common/values/parsed_map_field_value_test.cc @@ -23,13 +23,13 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/memory.h" #include "common/type.h" #include "common/value.h" #include "common/value_kind.h" #include "common/value_testing.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" namespace cel { diff --git a/common/values/parsed_message_value_test.cc b/common/values/parsed_message_value_test.cc index 6a1e59ead..1ae4cde9c 100644 --- a/common/values/parsed_message_value_test.cc +++ b/common/values/parsed_message_value_test.cc @@ -19,6 +19,7 @@ #include "absl/status/status_matchers.h" #include "absl/strings/cord.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "base/attribute.h" #include "common/memory.h" #include "common/type.h" @@ -26,7 +27,6 @@ #include "common/value_kind.h" #include "common/value_testing.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" namespace cel { diff --git a/common/values/parsed_repeated_field_value_test.cc b/common/values/parsed_repeated_field_value_test.cc index bb50bee55..b14e8753f 100644 --- a/common/values/parsed_repeated_field_value_test.cc +++ b/common/values/parsed_repeated_field_value_test.cc @@ -23,6 +23,7 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/memory.h" #include "common/type.h" #include "common/value.h" @@ -30,7 +31,6 @@ #include "common/value_testing.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" diff --git a/common/values/struct_value_test.cc b/common/values/struct_value_test.cc index 275acf70a..af26cb487 100644 --- a/common/values/struct_value_test.cc +++ b/common/values/struct_value_test.cc @@ -13,12 +13,12 @@ // limitations under the License. #include "absl/base/attributes.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/value.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel { diff --git a/compiler/BUILD b/compiler/BUILD index 3444e0f73..0169fe98d 100644 --- a/compiler/BUILD +++ b/compiler/BUILD @@ -125,11 +125,11 @@ cc_test( "//internal:testing", "//internal:testing_descriptor_pool", "//testutil:baseline_tests", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", ], ) diff --git a/compiler/optional_test.cc b/compiler/optional_test.cc index f5091b9fc..a0ed01f53 100644 --- a/compiler/optional_test.cc +++ b/compiler/optional_test.cc @@ -24,6 +24,7 @@ #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "checker/optional.h" #include "checker/standard_library.h" #include "checker/type_check_issue.h" @@ -37,7 +38,6 @@ #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "testutil/baseline_tests.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" namespace cel { namespace { diff --git a/conformance/BUILD b/conformance/BUILD index ddef1eaf8..7c91d24ad 100644 --- a/conformance/BUILD +++ b/conformance/BUILD @@ -72,14 +72,14 @@ cc_library( "//runtime:runtime_options", "//runtime:standard_runtime_builder_factory", "//testutil:test_macros", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_googleapis//google/api/expr/conformance/v1alpha1:conformance_cc_proto", "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto", "@com_google_googleapis//google/rpc:code_cc_proto", @@ -101,6 +101,7 @@ cc_library( ":utils", "//internal:runfiles", "//internal:testing_no_main", + "@cel_conformance//proto/cel/expr/conformance/test:simple_cc_proto", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status", @@ -110,7 +111,6 @@ cc_library( "@com_google_absl//absl/types:span", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", "@com_google_cel_spec//proto/cel/expr:value_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:simple_cc_proto", "@com_google_googleapis//google/api/expr/conformance/v1alpha1:conformance_cc_proto", "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto", "@com_google_googleapis//google/rpc:code_cc_proto", @@ -136,37 +136,37 @@ cc_library( ) _ALL_TESTS = [ - "@com_google_cel_spec//tests/simple:testdata/basic.textproto", - "@com_google_cel_spec//tests/simple:testdata/bindings_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/comparisons.textproto", - "@com_google_cel_spec//tests/simple:testdata/conversions.textproto", - "@com_google_cel_spec//tests/simple:testdata/dynamic.textproto", - "@com_google_cel_spec//tests/simple:testdata/encoders_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/enums.textproto", - "@com_google_cel_spec//tests/simple:testdata/fields.textproto", - "@com_google_cel_spec//tests/simple:testdata/fp_math.textproto", - "@com_google_cel_spec//tests/simple:testdata/integer_math.textproto", - "@com_google_cel_spec//tests/simple:testdata/lists.textproto", - "@com_google_cel_spec//tests/simple:testdata/lists_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/logic.textproto", - "@com_google_cel_spec//tests/simple:testdata/macros.textproto", - "@com_google_cel_spec//tests/simple:testdata/macros2.textproto", - "@com_google_cel_spec//tests/simple:testdata/math_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/namespace.textproto", - "@com_google_cel_spec//tests/simple:testdata/optionals.textproto", - "@com_google_cel_spec//tests/simple:testdata/parse.textproto", - "@com_google_cel_spec//tests/simple:testdata/plumbing.textproto", - "@com_google_cel_spec//tests/simple:testdata/proto2.textproto", - "@com_google_cel_spec//tests/simple:testdata/proto2_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/proto3.textproto", - "@com_google_cel_spec//tests/simple:testdata/string.textproto", - "@com_google_cel_spec//tests/simple:testdata/string_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/timestamps.textproto", - "@com_google_cel_spec//tests/simple:testdata/unknowns.textproto", - "@com_google_cel_spec//tests/simple:testdata/wrappers.textproto", - "@com_google_cel_spec//tests/simple:testdata/block_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/sets_ext.textproto", - "@com_google_cel_spec//tests/simple:testdata/type_deduction.textproto", + "@cel_conformance//tests/simple:testdata/basic.textproto", + "@cel_conformance//tests/simple:testdata/bindings_ext.textproto", + "@cel_conformance//tests/simple:testdata/comparisons.textproto", + "@cel_conformance//tests/simple:testdata/conversions.textproto", + "@cel_conformance//tests/simple:testdata/dynamic.textproto", + "@cel_conformance//tests/simple:testdata/encoders_ext.textproto", + "@cel_conformance//tests/simple:testdata/enums.textproto", + "@cel_conformance//tests/simple:testdata/fields.textproto", + "@cel_conformance//tests/simple:testdata/fp_math.textproto", + "@cel_conformance//tests/simple:testdata/integer_math.textproto", + "@cel_conformance//tests/simple:testdata/lists.textproto", + "@cel_conformance//tests/simple:testdata/lists_ext.textproto", + "@cel_conformance//tests/simple:testdata/logic.textproto", + "@cel_conformance//tests/simple:testdata/macros.textproto", + "@cel_conformance//tests/simple:testdata/macros2.textproto", + "@cel_conformance//tests/simple:testdata/math_ext.textproto", + "@cel_conformance//tests/simple:testdata/namespace.textproto", + "@cel_conformance//tests/simple:testdata/optionals.textproto", + "@cel_conformance//tests/simple:testdata/parse.textproto", + "@cel_conformance//tests/simple:testdata/plumbing.textproto", + "@cel_conformance//tests/simple:testdata/proto2.textproto", + "@cel_conformance//tests/simple:testdata/proto2_ext.textproto", + "@cel_conformance//tests/simple:testdata/proto3.textproto", + "@cel_conformance//tests/simple:testdata/string.textproto", + "@cel_conformance//tests/simple:testdata/string_ext.textproto", + "@cel_conformance//tests/simple:testdata/timestamps.textproto", + "@cel_conformance//tests/simple:testdata/unknowns.textproto", + "@cel_conformance//tests/simple:testdata/wrappers.textproto", + "@cel_conformance//tests/simple:testdata/block_ext.textproto", + "@cel_conformance//tests/simple:testdata/sets_ext.textproto", + "@cel_conformance//tests/simple:testdata/type_deduction.textproto", ] _TESTS_TO_SKIP = [ diff --git a/conformance/policy/BUILD b/conformance/policy/BUILD index 50ea27534..6fd09c727 100644 --- a/conformance/policy/BUILD +++ b/conformance/policy/BUILD @@ -51,6 +51,7 @@ cc_library( "//runtime:activation", "//runtime:bind_proto_to_activation", "//runtime:function_adapter", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/memory", @@ -58,7 +59,6 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_cel_spec//proto/cel/expr:value_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], alwayslink = True, diff --git a/conformance/policy/policy_conformance_test.cc b/conformance/policy/policy_conformance_test.cc index 2f05aed04..c0b6aff1a 100644 --- a/conformance/policy/policy_conformance_test.cc +++ b/conformance/policy/policy_conformance_test.cc @@ -29,6 +29,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "common/ast.h" #include "common/internal/value_conversion.h" #include "common/source.h" @@ -55,7 +56,6 @@ #include "runtime/bind_proto_to_activation.h" #include "runtime/function_adapter.h" #include "runtime/runtime.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" diff --git a/conformance/run.cc b/conformance/run.cc index 67cd7c694..971a78970 100644 --- a/conformance/run.cc +++ b/conformance/run.cc @@ -46,11 +46,11 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/span.h" +#include "cel/expr/conformance/test/simple.pb.h" #include "conformance/service.h" #include "conformance/utils.h" #include "internal/runfiles.h" #include "internal/testing.h" -#include "cel/expr/conformance/test/simple.pb.h" #include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" diff --git a/conformance/service.cc b/conformance/service.cc index 3d5fef919..468eee980 100644 --- a/conformance/service.cc +++ b/conformance/service.cc @@ -34,6 +34,9 @@ #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" +#include "cel/expr/conformance/proto2/test_all_types_extensions.pb.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "checker/checker_options.h" #include "checker/optional.h" #include "checker/standard_library.h" @@ -81,9 +84,6 @@ #include "runtime/runtime_options.h" #include "runtime/standard_runtime_builder_factory.h" #include "testutil/test_macros.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" -#include "cel/expr/conformance/proto2/test_all_types_extensions.pb.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/eval/compiler/BUILD b/eval/compiler/BUILD index 5395f2e4b..a5cfa29e0 100644 --- a/eval/compiler/BUILD +++ b/eval/compiler/BUILD @@ -198,6 +198,7 @@ cc_test( "//runtime:runtime_options", "//runtime:standard_functions", "//runtime/internal:runtime_env_testing", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status", @@ -208,7 +209,6 @@ cc_test( "@com_google_absl//absl/types:span", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -309,13 +309,13 @@ cc_test( "//parser:macro", "//runtime:runtime_options", "//runtime/internal:runtime_env_testing", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/eval/compiler/cel_expression_builder_flat_impl_test.cc b/eval/compiler/cel_expression_builder_flat_impl_test.cc index b48fbd959..b13f2fb6d 100644 --- a/eval/compiler/cel_expression_builder_flat_impl_test.cc +++ b/eval/compiler/cel_expression_builder_flat_impl_test.cc @@ -30,6 +30,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "eval/public/activation.h" #include "eval/public/builtin_func_registrar.h" #include "eval/public/cel_expression.h" @@ -46,7 +47,6 @@ #include "parser/parser.h" #include "runtime/internal/runtime_env_testing.h" #include "runtime/runtime_options.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" diff --git a/eval/compiler/flat_expr_builder_test.cc b/eval/compiler/flat_expr_builder_test.cc index a15a2e4f1..fe1a2ee71 100644 --- a/eval/compiler/flat_expr_builder_test.cc +++ b/eval/compiler/flat_expr_builder_test.cc @@ -35,6 +35,7 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/span.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "base/builtins.h" #include "checker/validation_result.h" #include "common/ast.h" @@ -87,7 +88,6 @@ #include "runtime/internal/runtime_env_testing.h" #include "runtime/runtime_options.h" #include "runtime/standard_functions.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" diff --git a/eval/eval/BUILD b/eval/eval/BUILD index 1e133ca3a..c19252d02 100644 --- a/eval/eval/BUILD +++ b/eval/eval/BUILD @@ -690,6 +690,7 @@ cc_test( "//runtime:runtime_options", "//runtime/internal:runtime_env", "//runtime/internal:runtime_env_testing", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", @@ -697,7 +698,6 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", "@com_google_protobuf//:wrappers_cc_proto", ], diff --git a/eval/eval/select_step_test.cc b/eval/eval/select_step_test.cc index e2adb9d2c..8a89529b5 100644 --- a/eval/eval/select_step_test.cc +++ b/eval/eval/select_step_test.cc @@ -13,6 +13,7 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "base/attribute.h" #include "base/attribute_set.h" #include "base/type_provider.h" @@ -37,7 +38,6 @@ #include "runtime/internal/runtime_env.h" #include "runtime/internal/runtime_env_testing.h" #include "runtime/runtime_options.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/descriptor.h" namespace google::api::expr::runtime { diff --git a/eval/public/containers/BUILD b/eval/public/containers/BUILD index 54dbf6189..7db22533e 100644 --- a/eval/public/containers/BUILD +++ b/eval/public/containers/BUILD @@ -157,10 +157,10 @@ cc_test( "//eval/testutil:test_message_cc_proto", "//internal:testing", "//internal:time", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/eval/public/containers/field_access_test.cc b/eval/public/containers/field_access_test.cc index 8c0bc0037..2a7e1a7b1 100644 --- a/eval/public/containers/field_access_test.cc +++ b/eval/public/containers/field_access_test.cc @@ -20,13 +20,13 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "eval/public/cel_value.h" #include "eval/public/structs/cel_proto_wrapper.h" #include "eval/public/testing/matchers.h" #include "eval/testutil/test_message.pb.h" #include "internal/testing.h" #include "internal/time.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" diff --git a/eval/public/structs/BUILD b/eval/public/structs/BUILD index 107451e01..1eb7d0772 100644 --- a/eval/public/structs/BUILD +++ b/eval/public/structs/BUILD @@ -218,10 +218,10 @@ cc_test( "//internal:testing", "//internal:time", "//testutil:util", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -484,11 +484,11 @@ cc_test( "//eval/public/testing:matchers", "//internal:testing", "//parser", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:differencer", "@com_google_protobuf//:protobuf", ], @@ -509,7 +509,7 @@ cc_test( "//extensions/protobuf/internal:map_reflection", "//internal:benchmark", "//internal:testing", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/eval/public/structs/dynamic_descriptor_pool_end_to_end_test.cc b/eval/public/structs/dynamic_descriptor_pool_end_to_end_test.cc index ae04cead5..92a21f3cb 100644 --- a/eval/public/structs/dynamic_descriptor_pool_end_to_end_test.cc +++ b/eval/public/structs/dynamic_descriptor_pool_end_to_end_test.cc @@ -20,6 +20,7 @@ #include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "eval/public/activation.h" #include "eval/public/builtin_func_registrar.h" #include "eval/public/cel_expr_builder_factory.h" @@ -30,7 +31,6 @@ #include "eval/public/testing/matchers.h" #include "internal/testing.h" #include "parser/parser.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" #include "google/protobuf/message.h" diff --git a/eval/public/structs/field_access_impl_benchmark_test.cc b/eval/public/structs/field_access_impl_benchmark_test.cc index 888e424b1..3df28a222 100644 --- a/eval/public/structs/field_access_impl_benchmark_test.cc +++ b/eval/public/structs/field_access_impl_benchmark_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "eval/public/cel_options.h" #include "eval/public/cel_value.h" #include "eval/public/structs/cel_proto_wrapper.h" #include "eval/public/structs/field_access_impl.h" #include "extensions/protobuf/internal/map_reflection.h" #include "internal/benchmark.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/map_field.h" diff --git a/eval/public/structs/field_access_impl_test.cc b/eval/public/structs/field_access_impl_test.cc index d7e6827c6..2c0d1c026 100644 --- a/eval/public/structs/field_access_impl_test.cc +++ b/eval/public/structs/field_access_impl_test.cc @@ -21,6 +21,7 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "eval/public/cel_value.h" #include "eval/public/structs/cel_proto_wrapper.h" #include "eval/public/testing/matchers.h" @@ -28,7 +29,6 @@ #include "internal/testing.h" #include "internal/time.h" #include "testutil/util.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/extensions/BUILD b/extensions/BUILD index 178f34ca9..d9f8d7684 100644 --- a/extensions/BUILD +++ b/extensions/BUILD @@ -283,11 +283,11 @@ cc_test( "//internal:testing", "//parser", "//parser:macro", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:string_view", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -411,6 +411,7 @@ cc_test( "//runtime/internal:runtime_env", "//runtime/internal:runtime_env_testing", "//testutil:test_external_extensions_descriptor_set", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log:absl_check", @@ -422,7 +423,6 @@ cc_test( "@com_google_absl//absl/types:span", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:empty_cc_proto", "@com_google_protobuf//:protobuf", ], @@ -867,6 +867,7 @@ cc_test( "//runtime:runtime_builder", "//runtime:runtime_options", "//runtime:standard_runtime_builder_factory", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:status_matchers", @@ -875,7 +876,6 @@ cc_test( "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/time", "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -952,12 +952,12 @@ cc_test( "//runtime:standard_runtime_builder_factory", "//runtime/internal:runtime_env", "//runtime/internal:runtime_env_testing", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/extensions/bindings_ext_test.cc b/extensions/bindings_ext_test.cc index 3c396616c..c5da46d01 100644 --- a/extensions/bindings_ext_test.cc +++ b/extensions/bindings_ext_test.cc @@ -24,6 +24,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "base/attribute.h" #include "eval/public/activation.h" #include "eval/public/builtin_func_registrar.h" @@ -38,7 +39,6 @@ #include "internal/testing.h" #include "parser/macro.h" #include "parser/parser.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/text_format.h" diff --git a/extensions/formatting_test.cc b/extensions/formatting_test.cc index a07dd0bb1..e699cdbf6 100644 --- a/extensions/formatting_test.cc +++ b/extensions/formatting_test.cc @@ -31,6 +31,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/value.h" #include "extensions/protobuf/runtime_adapter.h" #include "internal/parse_text_proto.h" @@ -44,7 +45,6 @@ #include "runtime/runtime_builder.h" #include "runtime/runtime_options.h" #include "runtime/standard_runtime_builder_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel::extensions { diff --git a/extensions/protobuf/BUILD b/extensions/protobuf/BUILD index eae7a7b68..948abef02 100644 --- a/extensions/protobuf/BUILD +++ b/extensions/protobuf/BUILD @@ -123,13 +123,13 @@ cc_test( "//common:value_testing", "//internal:testing", "//testutil:test_external_extensions_descriptor_set", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/time", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:any_cc_proto", "@com_google_protobuf//:duration_cc_proto", "@com_google_protobuf//:protobuf", @@ -152,10 +152,10 @@ cc_test( "//runtime:activation", "//runtime:runtime_options", "//runtime:standard_runtime_builder_factory", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/time", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -186,9 +186,9 @@ cc_test( "//common:value_testing", "//internal:testing", "//runtime:activation", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", "@com_google_protobuf//:wrappers_cc_proto", ], @@ -217,6 +217,6 @@ cc_test( "//common:value_testing", "//internal:proto_matchers", "//internal:testing", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", ], ) diff --git a/extensions/protobuf/bind_proto_to_activation_test.cc b/extensions/protobuf/bind_proto_to_activation_test.cc index a0ab69123..7ff592dc9 100644 --- a/extensions/protobuf/bind_proto_to_activation_test.cc +++ b/extensions/protobuf/bind_proto_to_activation_test.cc @@ -17,11 +17,11 @@ #include "google/protobuf/wrappers.pb.h" #include "absl/status/status.h" #include "absl/status/status_matchers.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "common/value.h" #include "common/value_testing.h" #include "internal/testing.h" #include "runtime/activation.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel::extensions { diff --git a/extensions/protobuf/value_end_to_end_test.cc b/extensions/protobuf/value_end_to_end_test.cc index 69a59bc19..ece33dcca 100644 --- a/extensions/protobuf/value_end_to_end_test.cc +++ b/extensions/protobuf/value_end_to_end_test.cc @@ -22,6 +22,7 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/value.h" #include "common/value_testing.h" #include "extensions/protobuf/runtime_adapter.h" @@ -31,7 +32,6 @@ #include "runtime/runtime.h" #include "runtime/runtime_options.h" #include "runtime/standard_runtime_builder_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/extensions/protobuf/value_test.cc b/extensions/protobuf/value_test.cc index 712745c36..66ebd0467 100644 --- a/extensions/protobuf/value_test.cc +++ b/extensions/protobuf/value_test.cc @@ -31,13 +31,13 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "base/attribute.h" #include "common/value.h" #include "common/value_kind.h" #include "common/value_testing.h" #include "internal/testing.h" #include "testutil/test_external_extensions_descriptor_set.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" #include "google/protobuf/message.h" diff --git a/extensions/protobuf/value_testing_test.cc b/extensions/protobuf/value_testing_test.cc index d84930349..850480098 100644 --- a/extensions/protobuf/value_testing_test.cc +++ b/extensions/protobuf/value_testing_test.cc @@ -14,12 +14,12 @@ #include "extensions/protobuf/value_testing.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "common/value.h" #include "common/value_testing.h" #include "extensions/protobuf/value.h" #include "internal/proto_matchers.h" #include "internal/testing.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" namespace cel::extensions::test { namespace { diff --git a/extensions/select_optimization_test.cc b/extensions/select_optimization_test.cc index 70dc079d2..d6efb8de6 100644 --- a/extensions/select_optimization_test.cc +++ b/extensions/select_optimization_test.cc @@ -35,6 +35,7 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/span.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "base/ast.h" #include "base/attribute.h" #include "base/builtins.h" @@ -80,7 +81,6 @@ #include "runtime/standard_runtime_builder_factory.h" #include "runtime/type_registry.h" #include "testutil/test_external_extensions_descriptor_set.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" diff --git a/extensions/set_membership_optimization_test.cc b/extensions/set_membership_optimization_test.cc index aff9f6dc5..3e5401317 100644 --- a/extensions/set_membership_optimization_test.cc +++ b/extensions/set_membership_optimization_test.cc @@ -25,6 +25,7 @@ #include "absl/status/status_matchers.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "base/attribute.h" #include "checker/type_checker_builder.h" #include "checker/validation_result.h" @@ -58,7 +59,6 @@ #include "runtime/runtime_options.h" #include "runtime/standard_functions.h" #include "runtime/standard_runtime_builder_factory.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel::extensions { diff --git a/internal/BUILD b/internal/BUILD index 56910fcc4..ce0d49594 100644 --- a/internal/BUILD +++ b/internal/BUILD @@ -562,12 +562,12 @@ cel_proto_transitive_descriptor_set( "//eval/testutil:test_extensions_proto", "//eval/testutil:test_message_proto", "//testutil:test_json_names_proto", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_proto", "@com_google_cel_spec//proto/cel/expr:checked_proto", "@com_google_cel_spec//proto/cel/expr:expr_proto", "@com_google_cel_spec//proto/cel/expr:syntax_proto", "@com_google_cel_spec//proto/cel/expr:value_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", @@ -727,6 +727,7 @@ cc_test( ":testing_descriptor_pool", ":testing_message_factory", ":well_known_types", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/log:die_if_null", @@ -736,7 +737,6 @@ cc_test( "@com_google_absl//absl/strings:cord", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/time", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:any_cc_proto", "@com_google_protobuf//:duration_cc_proto", "@com_google_protobuf//:field_mask_cc_proto", @@ -786,12 +786,12 @@ cc_test( ":testing", ":testing_descriptor_pool", ":testing_message_factory", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/log:die_if_null", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:any_cc_proto", "@com_google_protobuf//:duration_cc_proto", "@com_google_protobuf//:field_mask_cc_proto", @@ -840,6 +840,7 @@ cc_test( ":testing_message_factory", ":well_known_types", "//common:memory", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/log:absl_check", @@ -850,7 +851,6 @@ cc_test( "@com_google_absl//absl/strings:cord", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:optional", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:any_cc_proto", "@com_google_protobuf//:duration_cc_proto", "@com_google_protobuf//:protobuf", diff --git a/internal/json_test.cc b/internal/json_test.cc index 5f88b117a..a9655f620 100644 --- a/internal/json_test.cc +++ b/internal/json_test.cc @@ -25,13 +25,13 @@ #include "absl/status/status.h" #include "absl/status/status_matchers.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "internal/equals_text_proto.h" #include "internal/message_type_name.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/internal/message_equality_test.cc b/internal/message_equality_test.cc index c08116181..94d68c79e 100644 --- a/internal/message_equality_test.cc +++ b/internal/message_equality_test.cc @@ -34,6 +34,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/memory.h" #include "internal/message_type_name.h" #include "internal/parse_text_proto.h" @@ -41,7 +42,6 @@ #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" #include "internal/well_known_types.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/internal/well_known_types_test.cc b/internal/well_known_types_test.cc index aae66c51c..5581cf10a 100644 --- a/internal/well_known_types_test.cc +++ b/internal/well_known_types_test.cc @@ -34,13 +34,13 @@ #include "absl/strings/cord.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "internal/message_type_name.h" #include "internal/minimal_descriptor_pool.h" #include "internal/parse_text_proto.h" #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/policy/BUILD b/policy/BUILD index f14d39f73..0686ad2f5 100644 --- a/policy/BUILD +++ b/policy/BUILD @@ -235,11 +235,11 @@ cc_library( features = ["-use_header_modules"], deps = [ "//internal:status_macros", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_cel_spec//proto/cel/expr:value_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:struct_cc_proto", "@yaml-cpp", ], diff --git a/runtime/BUILD b/runtime/BUILD index 00753a616..f4be5adbf 100644 --- a/runtime/BUILD +++ b/runtime/BUILD @@ -136,9 +136,9 @@ cc_test( "//common:value", "//common:value_testing", "//internal:testing", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", "@com_google_protobuf//:wrappers_cc_proto", ], @@ -377,12 +377,12 @@ cc_test( "//internal:status_macros", "//internal:testing", "//internal:testing_descriptor_pool", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -726,6 +726,7 @@ cc_test( "//compiler:standard_library", "//internal:status_macros", "//internal:testing", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log:absl_check", @@ -734,7 +735,6 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:variant", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:any_cc_proto", "@com_google_protobuf//:differencer", "@com_google_protobuf//:protobuf", diff --git a/runtime/bind_proto_to_activation_test.cc b/runtime/bind_proto_to_activation_test.cc index e28fbef1b..65c7eecd1 100644 --- a/runtime/bind_proto_to_activation_test.cc +++ b/runtime/bind_proto_to_activation_test.cc @@ -19,11 +19,11 @@ #include "google/protobuf/wrappers.pb.h" #include "absl/status/status.h" #include "absl/status/status_matchers.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "common/value.h" #include "common/value_testing.h" #include "internal/testing.h" #include "runtime/activation.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" namespace cel { diff --git a/runtime/internal/BUILD b/runtime/internal/BUILD index 42a885958..0380de236 100644 --- a/runtime/internal/BUILD +++ b/runtime/internal/BUILD @@ -203,7 +203,7 @@ cc_test( "//internal:testing", "//internal:testing_descriptor_pool", "//internal:testing_message_factory", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/runtime/internal/legacy_runtime_type_provider_test.cc b/runtime/internal/legacy_runtime_type_provider_test.cc index bd3caddc4..4c1e602ff 100644 --- a/runtime/internal/legacy_runtime_type_provider_test.cc +++ b/runtime/internal/legacy_runtime_type_provider_test.cc @@ -17,13 +17,13 @@ #include #include +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "common/type.h" #include "common/value.h" #include "internal/testing.h" #include "internal/testing_descriptor_pool.h" #include "internal/testing_message_factory.h" #include "runtime/internal/runtime_type_provider.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/runtime/memory_safety_test.cc b/runtime/memory_safety_test.cc index f2903d820..0769c4626 100644 --- a/runtime/memory_safety_test.cc +++ b/runtime/memory_safety_test.cc @@ -31,6 +31,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "checker/validation_result.h" #include "common/decl.h" #include "common/type.h" @@ -52,7 +53,6 @@ #include "runtime/runtime_builder.h" #include "runtime/runtime_options.h" #include "runtime/standard_runtime_builder_factory.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/runtime/optimized_runtime_builder_factory_test.cc b/runtime/optimized_runtime_builder_factory_test.cc index bdec3c542..c7ca3b892 100644 --- a/runtime/optimized_runtime_builder_factory_test.cc +++ b/runtime/optimized_runtime_builder_factory_test.cc @@ -24,6 +24,7 @@ #include "absl/status/status_matchers.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "checker/type_checker_builder.h" #include "checker/validation_result.h" #include "common/ast.h" @@ -47,7 +48,6 @@ #include "runtime/runtime.h" #include "runtime/runtime_builder.h" #include "runtime/runtime_options.h" -#include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/testing/testrunner/BUILD b/testing/testrunner/BUILD index f01f892f3..e33373500 100644 --- a/testing/testrunner/BUILD +++ b/testing/testrunner/BUILD @@ -19,13 +19,13 @@ cc_library( "//runtime", "//runtime:activation", "//runtime:activation_interface", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/base:nullability", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/status:statusor", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", "@com_google_cel_spec//proto/cel/expr:value_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -53,6 +53,7 @@ cc_library( "//runtime", "//runtime:activation", "//runtime:activation_interface", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/functional:overload", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", @@ -60,7 +61,6 @@ cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:string_view", "@com_google_cel_spec//proto/cel/expr:value_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:differencer", "@com_google_protobuf//:protobuf", ], @@ -71,10 +71,10 @@ cc_library( hdrs = ["cel_test_factories.h"], deps = [ ":cel_test_context", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status:statusor", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", ], ) @@ -114,6 +114,8 @@ cc_test( "//runtime:function_overload_reference", "//runtime:runtime_builder", "//runtime:standard_runtime_builder_factory", + "@cel_conformance//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:absl_check", @@ -121,8 +123,6 @@ cc_test( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", - "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], ) @@ -154,6 +154,7 @@ cc_library( "//internal:status_macros", "//internal:testing_no_main", "//runtime", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/log:absl_log", @@ -161,7 +162,6 @@ cc_library( "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_cel_spec//proto/cel/expr:checked_cc_proto", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], alwayslink = True, diff --git a/testing/testrunner/cel_test_context.h b/testing/testrunner/cel_test_context.h index 988c37c66..52a96d08c 100644 --- a/testing/testrunner/cel_test_context.h +++ b/testing/testrunner/cel_test_context.h @@ -26,13 +26,13 @@ #include "absl/container/flat_hash_map.h" #include "absl/memory/memory.h" #include "absl/status/statusor.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "common/value.h" #include "compiler/compiler.h" #include "eval/public/cel_expression.h" #include "runtime/activation_interface.h" #include "runtime/runtime.h" #include "testing/testrunner/cel_expression_source.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/arena.h" namespace cel::test { diff --git a/testing/testrunner/cel_test_factories.h b/testing/testrunner/cel_test_factories.h index 61058be13..55aecc092 100644 --- a/testing/testrunner/cel_test_factories.h +++ b/testing/testrunner/cel_test_factories.h @@ -22,8 +22,8 @@ #include "absl/base/no_destructor.h" #include "absl/log/absl_check.h" #include "absl/status/statusor.h" -#include "testing/testrunner/cel_test_context.h" #include "cel/expr/conformance/test/suite.pb.h" +#include "testing/testrunner/cel_test_context.h" namespace cel::test { namespace internal { diff --git a/testing/testrunner/resources/simple_tests.textproto b/testing/testrunner/resources/simple_tests.textproto index 7add08851..d46c5eaaa 100644 --- a/testing/testrunner/resources/simple_tests.textproto +++ b/testing/testrunner/resources/simple_tests.textproto @@ -1,4 +1,4 @@ -# proto-file: google3/third_party/cel/spec/proto/cel/expr/conformance/test/suite.proto +# proto-file: google3/third_party/cel/conformance/proto/cel/expr/conformance/test/suite.proto # proto-message: cel.expr.conformance.test.TestSuite name: "simple_tests" diff --git a/testing/testrunner/runner_bin.cc b/testing/testrunner/runner_bin.cc index c11908ca5..9ec327b90 100644 --- a/testing/testrunner/runner_bin.cc +++ b/testing/testrunner/runner_bin.cc @@ -33,6 +33,7 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "eval/public/cel_expression.h" #include "internal/status_macros.h" #include "internal/testing.h" @@ -43,7 +44,6 @@ #include "testing/testrunner/coverage_index.h" #include "testing/testrunner/coverage_reporting.h" #include "testing/testrunner/runner_lib.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/text_format.h" ABSL_FLAG(std::string, test_suite_path, "", diff --git a/testing/testrunner/runner_lib.cc b/testing/testrunner/runner_lib.cc index 64d05176d..4e468f789 100644 --- a/testing/testrunner/runner_lib.cc +++ b/testing/testrunner/runner_lib.cc @@ -26,6 +26,7 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "checker/validation_result.h" #include "common/ast.h" #include "common/ast_proto.h" @@ -43,7 +44,6 @@ #include "testing/testrunner/cel_expression_source.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/coverage_index.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/testing/testrunner/runner_lib.h b/testing/testrunner/runner_lib.h index 4fcbed13a..437266f45 100644 --- a/testing/testrunner/runner_lib.h +++ b/testing/testrunner/runner_lib.h @@ -20,11 +20,11 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "common/value.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/coverage_index.h" #include "testing/testrunner/coverage_reporting.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/arena.h" namespace cel::test { diff --git a/testing/testrunner/runner_lib_test.cc b/testing/testrunner/runner_lib_test.cc index c34a1b1b0..e0dcc031e 100644 --- a/testing/testrunner/runner_lib_test.cc +++ b/testing/testrunner/runner_lib_test.cc @@ -27,6 +27,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "cel/expr/conformance/proto3/test_all_types.pb.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "base/attribute.h" #include "checker/type_checker_builder.h" #include "checker/validation_result.h" @@ -52,8 +54,6 @@ #include "testing/testrunner/cel_expression_source.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/coverage_index.h" -#include "cel/expr/conformance/proto3/test_all_types.pb.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/testing/testrunner/user_tests/BUILD b/testing/testrunner/user_tests/BUILD index 53cd8f716..7283e9fa5 100644 --- a/testing/testrunner/user_tests/BUILD +++ b/testing/testrunner/user_tests/BUILD @@ -53,10 +53,10 @@ cc_library( "//testing/testrunner:cel_expression_source", "//testing/testrunner:cel_test_context", "//testing/testrunner:cel_test_factories", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], alwayslink = True, @@ -80,11 +80,11 @@ cc_library( "//runtime:standard_runtime_builder_factory", "//testing/testrunner:cel_test_context", "//testing/testrunner:cel_test_factories", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/log:absl_log", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], alwayslink = True, @@ -102,11 +102,11 @@ cc_library( "//runtime:standard_runtime_builder_factory", "//testing/testrunner:cel_test_context", "//testing/testrunner:cel_test_factories", + "@cel_conformance//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_absl//absl/log:absl_check", "@com_google_absl//absl/log:absl_log", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_cel_spec//proto/cel/expr/conformance/test:suite_cc_proto", "@com_google_protobuf//:protobuf", ], alwayslink = True, diff --git a/testing/testrunner/user_tests/checked_expr_test.cc b/testing/testrunner/user_tests/checked_expr_test.cc index 44e4b46ae..9ca75a3fc 100644 --- a/testing/testrunner/user_tests/checked_expr_test.cc +++ b/testing/testrunner/user_tests/checked_expr_test.cc @@ -19,6 +19,7 @@ #include "absl/log/absl_log.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "internal/status_macros.h" #include "internal/testing_descriptor_pool.h" #include "runtime/runtime.h" @@ -26,7 +27,6 @@ #include "runtime/standard_runtime_builder_factory.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/cel_test_factories.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/text_format.h" namespace cel::testing { diff --git a/testing/testrunner/user_tests/raw_expr_and_cel_file_test.cc b/testing/testrunner/user_tests/raw_expr_and_cel_file_test.cc index b5fd59396..eb31b56db 100644 --- a/testing/testrunner/user_tests/raw_expr_and_cel_file_test.cc +++ b/testing/testrunner/user_tests/raw_expr_and_cel_file_test.cc @@ -19,6 +19,7 @@ #include "absl/log/absl_log.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "checker/type_checker_builder.h" #include "common/decl.h" #include "common/type.h" @@ -32,7 +33,6 @@ #include "runtime/standard_runtime_builder_factory.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/cel_test_factories.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/text_format.h" namespace cel::testing { diff --git a/testing/testrunner/user_tests/raw_expression_test.cc b/testing/testrunner/user_tests/raw_expression_test.cc index e52cc39dc..4f19d88d0 100644 --- a/testing/testrunner/user_tests/raw_expression_test.cc +++ b/testing/testrunner/user_tests/raw_expression_test.cc @@ -19,6 +19,7 @@ #include "absl/log/absl_check.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include "cel/expr/conformance/test/suite.pb.h" #include "checker/type_checker_builder.h" #include "common/decl.h" #include "common/type.h" @@ -33,7 +34,6 @@ #include "testing/testrunner/cel_expression_source.h" #include "testing/testrunner/cel_test_context.h" #include "testing/testrunner/cel_test_factories.h" -#include "cel/expr/conformance/test/suite.pb.h" #include "google/protobuf/text_format.h" namespace cel::testing { diff --git a/testutil/BUILD b/testutil/BUILD index 6574db5d5..61bd10e76 100644 --- a/testutil/BUILD +++ b/testutil/BUILD @@ -86,7 +86,7 @@ proto_library( proto_library( name = "test_external_extensions_proto", srcs = ["test_external_extensions.proto"], - deps = ["@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_proto"], + deps = ["@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_proto"], ) cel_proto_transitive_descriptor_set( diff --git a/tools/BUILD b/tools/BUILD index 8b6ba13d9..7f9558646 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -225,9 +225,9 @@ cc_test( deps = [ ":descriptor_pool_builder", "//internal:testing", + "@cel_conformance//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:status_matchers", - "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto", "@com_google_protobuf//:protobuf", ], ) diff --git a/tools/descriptor_pool_builder_test.cc b/tools/descriptor_pool_builder_test.cc index 82fa8f699..c5a0e1b1e 100644 --- a/tools/descriptor_pool_builder_test.cc +++ b/tools/descriptor_pool_builder_test.cc @@ -19,9 +19,9 @@ #include "google/protobuf/descriptor.pb.h" #include "absl/status/status.h" #include "absl/status/status_matchers.h" -#include "internal/testing.h" #include "cel/expr/conformance/proto2/test_all_types.pb.h" #include "cel/expr/conformance/proto2/test_all_types_extensions.pb.h" +#include "internal/testing.h" #include "google/protobuf/text_format.h" using ::absl_testing::IsOk;