Add conformance tests for planner

PiperOrigin-RevId: 875410045

Author: l46kok

MODULE.bazel

@@ -16,18 +16,23 @@ module(
     name = "cel_java",
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "rules_jvm_external", version = "6.9")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "rules_jvm_external", version = "6.10")
 bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")  # see https://github.com/bazelbuild/rules_android/issues/373
-bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "googleapis", version = "0.0.0-20260223-edfe7983", repo_name = "com_google_googleapis")
+bazel_dep(name = "rules_pkg", version = "1.2.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_java", version = "9.3.0")
 bazel_dep(name = "rules_android", version = "0.7.1")
 bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "googleapis-java", version = "1.0.0")
-bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")
+bazel_dep(name = "cel-spec", version = "0.25.1", repo_name = "cel_spec")
+bazel_dep(name = "rules_go", version = "0.50.1")
+
+# Required by cel-spec to satisfy gazelle transitive dependency
+go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
+go_sdk.download(version = "1.23.0")
 
 switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
 switched_rules.use_languages(java = True)

bundle/src/main/java/dev/cel/bundle/CelEnvironment.java

@@ -672,6 +672,10 @@ public CelType toCelType(CelTypeProvider celTypeProvider) {
             return TypeParamType.create(name());
           }
 
+          if (name().equals("dyn")) {
+            return SimpleType.DYN;
+          }
+
           CelType simpleType = SimpleType.findByName(name()).orElse(null);
           if (simpleType != null) {
             return simpleType;

common/src/main/java/dev/cel/common/types/SimpleType.java

@@ -46,7 +46,6 @@ public abstract class SimpleType extends CelType {
 
   public static final ImmutableMap<String, CelType> TYPE_MAP =
       ImmutableMap.of(
-          DYN.name(), DYN,
           BOOL.name(), BOOL,
           BYTES.name(), BYTES,
           DOUBLE.name(), DOUBLE,

common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

@@ -17,6 +17,8 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 
+import com.google.common.base.CaseFormat;
+import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -27,6 +29,7 @@
 import com.google.protobuf.BytesValue;
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Duration;
+import com.google.protobuf.FieldMask;
 import com.google.protobuf.FloatValue;
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Int64Value;
@@ -41,6 +44,8 @@
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.ProtoTimeUtils;
 import dev.cel.common.internal.WellKnownProto;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
@@ -98,6 +103,17 @@ protected Object fromWellKnownProto(MessageLiteOrBuilder message, WellKnownProto
         return UnsignedLong.valueOf(((UInt32Value) message).getValue());
       case UINT64_VALUE:
         return UnsignedLong.fromLongBits(((UInt64Value) message).getValue());
+      case FIELD_MASK:
+        FieldMask fieldMask = (FieldMask) message;
+        List<String> paths = new ArrayList<>(fieldMask.getPathsCount());
+        for (String path : fieldMask.getPathsList()) {
+          if (!path.isEmpty()) {
+            paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
+          }
+        }
+        return normalizePrimitive(Joiner.on(",").join(paths));
+      case EMPTY:
+        return ImmutableMap.of();
       default:
         throw new UnsupportedOperationException(
             "Unsupported well known proto conversion - " + wellKnownProto);

common/src/main/java/dev/cel/common/values/CelValueConverter.java

@@ -54,6 +54,10 @@ public Object unwrap(CelValue celValue) {
       return Optional.of(optionalValue.value());
     }
 
+    if (celValue instanceof ErrorValue) {
+      return celValue;
+    }
+
     return celValue.value();
   }
 

conformance/src/test/java/dev/cel/conformance/BUILD.bazel

@@ -29,6 +29,7 @@ java_library(
         "//parser:parser_builder",
         "//parser:parser_factory",
         "//runtime",
+        "//runtime:runtime_planner_impl",
         "//testing:expr_value_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
@@ -57,6 +58,8 @@ java_library(
     deps = MAVEN_JAR_DEPS + [
         "//:java_truth",
         "//compiler:compiler_builder",
+        "//parser:parser_factory",
+        "//runtime:runtime_planner_impl",
         "//testing:expr_value_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
@@ -100,14 +103,8 @@ _ALL_TESTS = [
     "@cel_spec//tests/simple:testdata/wrappers.textproto",
 ]
 
-_TESTS_TO_SKIP = [
-    # Tests which require spec changes.
-    # TODO: Deprecate Duration.get_milliseconds
-    "timestamps/duration_converters/get_milliseconds",
-
+_TESTS_TO_SKIP_LEGACY = [
     # Broken test cases which should be supported.
-    # TODO: Invalid bytes to string conversion should error.
-    "conversions/string/bytes_invalid",
     # TODO: Support setting / getting enum values out of the defined enum value range.
     "enums/legacy_proto2/select_big,select_neg",
     "enums/legacy_proto2/assign_standalone_int_big,assign_standalone_int_neg",
@@ -116,7 +113,6 @@ _TESTS_TO_SKIP = [
     # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
     "conversions/int/double_int_min_range",
     # TODO: Duration and timestamp operations should error on overflow.
-    "timestamps/duration_range/from_string_under,from_string_over",
     "timestamps/timestamp_range/sub_time_duration_over,sub_time_duration_under",
     # TODO: Ensure adding negative duration values is appropriately supported.
     "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",
@@ -159,21 +155,85 @@ _TESTS_TO_SKIP = [
     "type_deductions/legacy_nullable_types/null_assignable_to_timestamp_parameter_candidate",
 ]
 
+_TESTS_TO_SKIP_PLANNER = [
+    # TODO: Add strings.format and strings.quote.
+    "string_ext/quote",
+    "string_ext/format",
+    "string_ext/format_errors",
+
+    # TODO: Check behavior for go/cpp
+    "basic/functions/unbound",
+    "basic/functions/unbound_is_runtime_error",
+
+    # TODO: Ensure overflow occurs on conversions of double values which might not work properly on all platforms.
+    "conversions/int/double_int_min_range",
+    "enums/legacy_proto3/assign_standalone_int_too_big",
+    "enums/legacy_proto3/assign_standalone_int_too_neg",
+
+    # TODO: Duration and timestamp operations should error on overflow.
+    "timestamps/timestamp_range/sub_time_duration_over",
+    "timestamps/timestamp_range/sub_time_duration_under",
+
+    # Skip until fixed.
+    "fields/qualified_identifier_resolution/map_key_float",
+    "fields/qualified_identifier_resolution/map_key_null",
+    "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
+    "optionals/optionals/map_null_entry_no_such_key",
+    "optionals/optionals/map_present_key_invalid_field",
+    "parse/receiver_function_names",
+    "proto2/extensions_get/package_scoped_test_all_types_ext",
+    "proto2/extensions_get/package_scoped_repeated_test_all_types",
+    "proto2/extensions_get/message_scoped_nested_ext",
+    "proto2/extensions_get/message_scoped_repeated_test_all_types",
+    "proto2_ext/get_ext/package_scoped_repeated_test_all_types",
+    "proto2_ext/get_ext/message_scoped_repeated_test_all_types",
+
+    # TODO: Fix null assignment to a field
+    "proto2/set_null/single_message",
+    "proto2/set_null/single_duration",
+    "proto2/set_null/single_timestamp",
+    "proto3/set_null/single_message",
+    "proto3/set_null/single_duration",
+    "proto3/set_null/single_timestamp",
+
+    # Type inference edgecases around null(able) assignability.
+    # These type check, but resolve to a different type.
+    # list(int), want list(wrapper(int))
+    "type_deductions/wrappers/wrapper_promotion",
+    # list(null), want list(Message)
+    "type_deductions/legacy_nullable_types/null_assignable_to_message_parameter_candidate",
+    "type_deductions/legacy_nullable_types/null_assignable_to_abstract_parameter_candidate",
+    "type_deductions/legacy_nullable_types/null_assignable_to_duration_parameter_candidate",
+    "type_deductions/legacy_nullable_types/null_assignable_to_timestamp_parameter_candidate",
+
+    # Future features for CEL 1.0
+    # TODO: Strong typing support for enums, specified but not implemented.
+    "enums/strong_proto2",
+    "enums/strong_proto3",
+]
+
 conformance_test(
     name = "conformance",
     data = _ALL_TESTS,
-    skip_tests = _TESTS_TO_SKIP,
+    skip_tests = _TESTS_TO_SKIP_LEGACY,
 )
 
 conformance_test(
     name = "conformance_maven",
     data = _ALL_TESTS,
     mode = MODE.MAVEN_TEST,
-    skip_tests = _TESTS_TO_SKIP,
+    skip_tests = _TESTS_TO_SKIP_LEGACY,
 )
 
 conformance_test(
     name = "conformance_dashboard",
     data = _ALL_TESTS,
     mode = MODE.DASHBOARD,
 )
+
+conformance_test(
+    name = "conformance_planner",
+    data = _ALL_TESTS,
+    skip_tests = _TESTS_TO_SKIP_PLANNER,
+    use_planner = True,
+)

conformance/src/test/java/dev/cel/conformance/ConformanceTest.java

@@ -45,7 +45,9 @@
 import dev.cel.runtime.CelEvaluationException;
 import dev.cel.runtime.CelRuntime;
 import dev.cel.runtime.CelRuntime.Program;
+import dev.cel.runtime.CelRuntimeBuilder;
 import dev.cel.runtime.CelRuntimeFactory;
+import dev.cel.runtime.CelRuntimeImpl;
 import dev.cel.runtime.CelRuntimeLibrary;
 import java.util.Map;
 import org.junit.runners.model.Statement;
@@ -118,15 +120,25 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
         .build();
   }
 
-  private static final CelRuntime RUNTIME =
-      CelRuntimeFactory.standardCelRuntimeBuilder()
-          .setOptions(OPTIONS)
-          .addLibraries(CANONICAL_RUNTIME_EXTENSIONS)
-          .setExtensionRegistry(DEFAULT_EXTENSION_REGISTRY)
-          .addMessageTypes(dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor())
-          .addMessageTypes(dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor())
-          .addFileTypes(dev.cel.expr.conformance.proto2.TestAllTypesExtensions.getDescriptor())
-          .build();
+  private static CelRuntime getRuntime(SimpleTest test, boolean usePlanner) {
+    CelRuntimeBuilder builder =
+        usePlanner ? CelRuntimeImpl.newBuilder() : CelRuntimeFactory.standardCelRuntimeBuilder();
+
+    builder
+        // CEL-Internal-2
+        .setOptions(OPTIONS)
+        .addLibraries(CANONICAL_RUNTIME_EXTENSIONS)
+        .setExtensionRegistry(DEFAULT_EXTENSION_REGISTRY)
+        .addMessageTypes(dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor())
+        .addMessageTypes(dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor())
+        .addFileTypes(dev.cel.expr.conformance.proto2.TestAllTypesExtensions.getDescriptor());
+
+    if (usePlanner) {
+      builder.setContainer(CelContainer.ofName(test.getContainer()));
+    }
+
+    return builder.build();
+  }
 
   private static ImmutableMap<String, Object> getBindings(SimpleTest test) throws Exception {
     ImmutableMap.Builder<String, Object> bindings =
@@ -157,13 +169,15 @@ private static SimpleTest defaultTestMatcherToTrueIfUnset(SimpleTest test) {
   private final String name;
   private final SimpleTest test;
   private final boolean skip;
+  private final boolean usePlanner;
 
-  public ConformanceTest(String name, SimpleTest test, boolean skip) {
+  public ConformanceTest(String name, SimpleTest test, boolean skip, boolean usePlanner) {
     this.name = Preconditions.checkNotNull(name);
     this.test =
         Preconditions.checkNotNull(
             defaultTestMatcherToTrueIfUnset(Preconditions.checkNotNull(test)));
     this.skip = skip;
+    this.usePlanner = usePlanner;
   }
 
   public String getName() {
@@ -178,7 +192,9 @@ public boolean shouldSkip() {
   public void evaluate() throws Throwable {
     CelValidationResult response = getParser(test).parse(test.getExpr(), test.getName());
     assertThat(response.hasError()).isFalse();
-    response = getChecker(test).check(response.getAst());
+    if (!test.getDisableCheck()) {
+      response = getChecker(test).check(response.getAst());
+    }
     assertThat(response.hasError()).isFalse();
     Type resultType = CelProtoTypes.celTypeToType(response.getAst().getResultType());
 
@@ -188,7 +204,13 @@ public void evaluate() throws Throwable {
       return;
     }
 
-    Program program = RUNTIME.createProgram(response.getAst());
+    if (!usePlanner && test.getDisableCheck()) {
+      // Only planner supports parsed-only evaluation
+      return;
+    }
+
+    CelRuntime runtime = getRuntime(test, usePlanner);
+    Program program = runtime.createProgram(response.getAst());
     ExprValue result = null;
     CelEvaluationException error = null;
     try {

conformance/src/test/java/dev/cel/conformance/ConformanceTestRunner.java

@@ -43,6 +43,7 @@ public final class ConformanceTestRunner extends ParentRunner<ConformanceTest> {
 
   private final ImmutableSortedMap<String, SimpleTestFile> testFiles;
   private final ImmutableList<String> testsToSkip;
+  private final boolean usePlanner;
 
   private static ImmutableSortedMap<String, SimpleTestFile> loadTestFiles() {
     List<String> testPaths =
@@ -75,6 +76,9 @@ public ConformanceTestRunner(Class<?> clazz) throws InitializationError {
         ImmutableList.copyOf(
             SPLITTER.splitToList(
                 System.getProperty("dev.cel.conformance.ConformanceTests.skip_tests")));
+    usePlanner =
+        Boolean.parseBoolean(
+            System.getProperty("dev.cel.conformance.ConformanceTests.use_planner", "false"));
   }
 
   private boolean shouldSkipTest(String name) {
@@ -97,8 +101,7 @@ protected List<ConformanceTest> getChildren() {
         for (SimpleTest test : testSection.getTestList()) {
           String name =
               String.format("%s/%s/%s", testFile.getName(), testSection.getName(), test.getName());
-          tests.add(
-              new ConformanceTest(name, test, test.getDisableCheck() || shouldSkipTest(name)));
+          tests.add(new ConformanceTest(name, test, shouldSkipTest(name), usePlanner));
         }
       }
     }