cel-expr · copybara-service · Feb 13, 2025 · Feb 13, 2025
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -37,8 +37,7 @@ jobs:
        run: bazelisk --version
      - name: Bazel Test
        # Exclude codelab exercises as they are intentionally made to fail
-        # Exclude conformance tests for time being until TextFormat.Parser fix is in upstream
-        run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab,//conformance/src/test/java/dev/cel/conformance --test_output=errors
+        run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
      - name: Unwanted Dependencies
        run: .github/workflows/unwanted_deps.sh
      - run: echo "🍏 This job's status is ${{ job.status }}."
diff --git a/conformance/src/test/java/dev/cel/conformance/BUILD.bazel b/conformance/src/test/java/dev/cel/conformance/BUILD.bazel
@@ -31,8 +31,7 @@ java_library(
        "//parser:parser_builder",
        "//parser:parser_factory",
        "//runtime",
-        "@cel_spec//proto/cel/expr:checked_java_proto",
-        "@cel_spec//proto/cel/expr:value_java_proto",
+        "@cel_spec//proto/cel/expr:expr_java_proto",
        "@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_spec//proto/cel/expr/conformance/test:simple_java_proto",

diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java
@@ -93,6 +93,7 @@ private static TypeRegistry newDefaultTypeRegistry() {
          .enableHeterogeneousNumericComparisons(true)
          .enableProtoDifferencerEquality(true)
          .enableOptionalSyntax(true)
+          .enableQuotedIdentifierSyntax(true)
          .build();

  private static final CelParser PARSER_WITH_MACROS =
@@ -103,7 +104,7 @@ private static TypeRegistry newDefaultTypeRegistry() {
              CelExtensions.encoders(),
              CelExtensions.math(OPTIONS),
              CelExtensions.protos(),
-              CelExtensions.sets(),
+              CelExtensions.sets(OPTIONS),
              CelExtensions.strings(),
              CelOptionalLibrary.INSTANCE)
          .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
@@ -117,7 +118,7 @@ private static TypeRegistry newDefaultTypeRegistry() {
              CelExtensions.encoders(),
              CelExtensions.math(OPTIONS),
              CelExtensions.protos(),
-              CelExtensions.sets(),
+              CelExtensions.sets(OPTIONS),
              CelExtensions.strings(),
              CelOptionalLibrary.INSTANCE)
          .setStandardMacros()
@@ -142,7 +143,7 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
            CelExtensions.bindings(),
            CelExtensions.encoders(),
            CelExtensions.math(OPTIONS),
-            CelExtensions.sets(),
+            CelExtensions.sets(OPTIONS),
            CelExtensions.strings(),
            CelOptionalLibrary.INSTANCE)
        .addMessageTypes(dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor())
@@ -156,11 +157,13 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
          .addLibraries(
              CelExtensions.encoders(),
              CelExtensions.math(OPTIONS),
-              CelExtensions.sets(),
+              CelExtensions.sets(OPTIONS),
              CelExtensions.strings(),
              CelOptionalLibrary.INSTANCE)
+          .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 ImmutableMap<String, Object> getBindings(SimpleTest test) throws Exception {