google · copybara-service · Mar 24, 2026
diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java
@@ -16,8 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
-import static dev.cel.testing.utils.ExprValueUtils.DEFAULT_EXTENSION_REGISTRY;
-import static dev.cel.testing.utils.ExprValueUtils.DEFAULT_TYPE_REGISTRY;
 import static dev.cel.testing.utils.ExprValueUtils.fromValue;
 import static dev.cel.testing.utils.ExprValueUtils.toExprValue;
 
@@ -29,6 +27,8 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.TypeRegistry;
 import dev.cel.checker.CelChecker;
 import dev.cel.common.CelContainer;
 import dev.cel.common.CelOptions;
@@ -84,6 +84,21 @@ public final class ConformanceTest extends Statement {
           CelExtensions.strings(),
           CelOptionalLibrary.INSTANCE);
 
+  static final TypeRegistry CONFORMANCE_TYPE_REGISTRY =
+      TypeRegistry.newBuilder()
+          .add(dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor())
+          .add(dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor())
+          .build();
+
+  static final ExtensionRegistry CONFORMANCE_EXTENSION_REGISTRY =
+      createConformanceExtensionRegistry();
+
+  private static ExtensionRegistry createConformanceExtensionRegistry() {
+    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
+    dev.cel.expr.conformance.proto2.TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
+    return extensionRegistry;
+  }
+
   private static final CelParser PARSER_WITH_MACROS =
       CelParserFactory.standardCelParserBuilder()
           .setOptions(OPTIONS)
@@ -106,7 +121,7 @@ private static CelChecker getChecker(SimpleTest test) throws Exception {
     ImmutableList.Builder<Decl> decls =
         ImmutableList.builderWithExpectedSize(test.getTypeEnvCount());
     for (dev.cel.expr.Decl decl : test.getTypeEnvList()) {
-      decls.add(Decl.parseFrom(decl.toByteArray(), DEFAULT_EXTENSION_REGISTRY));
+      decls.add(Decl.parseFrom(decl.toByteArray(), CONFORMANCE_EXTENSION_REGISTRY));
     }
     return CelCompilerFactory.standardCelCheckerBuilder()
         .setOptions(OPTIONS)
@@ -127,7 +142,7 @@ private static CelRuntime getRuntime(SimpleTest test, boolean usePlanner) {
         // CEL-Internal-2
         .setOptions(OPTIONS)
         .addLibraries(CANONICAL_RUNTIME_EXTENSIONS)
-        .setExtensionRegistry(DEFAULT_EXTENSION_REGISTRY)
+        .setExtensionRegistry(CONFORMANCE_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());
@@ -151,7 +166,8 @@ private static ImmutableMap<String, Object> getBindings(SimpleTest test) throws
   private static Object fromExprValue(ExprValue value) throws Exception {
     switch (value.getKindCase()) {
       case VALUE:
-        return fromValue(value.getValue());
+        return fromValue(
+            value.getValue(), CONFORMANCE_TYPE_REGISTRY, CONFORMANCE_EXTENSION_REGISTRY);
       default:
         throw new IllegalArgumentException(
             String.format("Unexpected binding value kind: %s", value.getKindCase()));
@@ -224,7 +240,7 @@ public void evaluate() throws Throwable {
         assertThat(result)
             .ignoringRepeatedFieldOrderOfFieldDescriptors(
                 MapValue.getDescriptor().findFieldByName("entries"))
-            .unpackingAnyUsing(DEFAULT_TYPE_REGISTRY, DEFAULT_EXTENSION_REGISTRY)
+            .unpackingAnyUsing(CONFORMANCE_TYPE_REGISTRY, CONFORMANCE_EXTENSION_REGISTRY)
             .isEqualTo(ExprValue.newBuilder().setValue(test.getValue()).build());
         break;
       case EVAL_ERROR:
@@ -237,7 +253,7 @@ public void evaluate() throws Throwable {
         assertThat(result)
             .ignoringRepeatedFieldOrderOfFieldDescriptors(
                 MapValue.getDescriptor().findFieldByName("entries"))
-            .unpackingAnyUsing(DEFAULT_TYPE_REGISTRY, DEFAULT_EXTENSION_REGISTRY)
+            .unpackingAnyUsing(CONFORMANCE_TYPE_REGISTRY, CONFORMANCE_EXTENSION_REGISTRY)
             .isEqualTo(ExprValue.newBuilder().setValue(test.getTypedResult().getResult()).build());
         assertThat(resultType).isEqualTo(test.getTypedResult().getDeducedType());
         break;

diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTestRunner.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTestRunner.java
@@ -14,8 +14,7 @@
 
 package dev.cel.conformance;
 
-import static dev.cel.testing.utils.ExprValueUtils.DEFAULT_EXTENSION_REGISTRY;
-import static dev.cel.testing.utils.ExprValueUtils.DEFAULT_TYPE_REGISTRY;
+import static dev.cel.conformance.ConformanceTest.CONFORMANCE_EXTENSION_REGISTRY;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
@@ -50,14 +49,16 @@ private static ImmutableSortedMap<String, SimpleTestFile> loadTestFiles() {
         SPLITTER.splitToList(System.getProperty("dev.cel.conformance.ConformanceTests.tests"));
     try {
       TextFormat.Parser parser =
-          TextFormat.Parser.newBuilder().setTypeRegistry(DEFAULT_TYPE_REGISTRY).build();
+          TextFormat.Parser.newBuilder()
+              .setTypeRegistry(ConformanceTest.CONFORMANCE_TYPE_REGISTRY)
+              .build();
       ImmutableSortedMap.Builder<String, SimpleTestFile> testFiles =
           ImmutableSortedMap.naturalOrder();
       for (String testPath : testPaths) {
         SimpleTestFile.Builder fileBuilder = SimpleTestFile.newBuilder();
         try (BufferedReader input =
             Files.newBufferedReader(Paths.get(testPath), StandardCharsets.UTF_8)) {
-          parser.merge(input, DEFAULT_EXTENSION_REGISTRY, fileBuilder);
+          parser.merge(input, CONFORMANCE_EXTENSION_REGISTRY, fileBuilder);
         }
         SimpleTestFile testFile = fileBuilder.build();
         testFiles.put(testFile.getName(), testFile);

diff --git a/policy/src/main/java/dev/cel/policy/CelPolicy.java b/policy/src/main/java/dev/cel/policy/CelPolicy.java
@@ -27,6 +27,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,8 +78,7 @@ public abstract static class Builder {
 
     public abstract Builder setPolicySource(CelPolicySource policySource);
 
-    // This should stay package-private to encourage add/set methods to be used instead.
-    abstract ImmutableMap.Builder<String, Object> metadataBuilder();
+    private final HashMap<String, Object> metadata = new HashMap<>();
 
     public abstract Builder setMetadata(ImmutableMap<String, Object> value);
 
@@ -90,6 +90,10 @@ public List<Import> imports() {
       return Collections.unmodifiableList(importList);
     }
 
+    public Map<String, Object> metadata() {
+      return Collections.unmodifiableMap(metadata);
+    }
+
     @CanIgnoreReturnValue
     public Builder addImport(Import value) {
       importList.add(value);
@@ -104,20 +108,21 @@ public Builder addImports(Collection<Import> values) {
 
     @CanIgnoreReturnValue
     public Builder putMetadata(String key, Object value) {
-      metadataBuilder().put(key, value);
+      metadata.put(key, value);
       return this;
     }
 
     @CanIgnoreReturnValue
     public Builder putMetadata(Map<String, Object> map) {
-      metadataBuilder().putAll(map);
+      metadata.putAll(map);
       return this;
     }
 
     abstract CelPolicy autoBuild();
 
     public CelPolicy build() {
       setImports(ImmutableList.copyOf(importList));
+      setMetadata(ImmutableMap.copyOf(metadata));
       return autoBuild();
     }
   }

diff --git a/testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel b/testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
@@ -92,6 +92,7 @@ java_library(
         "//bundle:environment",
         "//bundle:environment_yaml_parser",
         "//common:cel_ast",
+        "//common:cel_descriptor_util",
         "//common:compiler_common",
         "//common:options",
         "//common:proto_ast",
@@ -134,6 +135,7 @@ java_library(
         ":cel_test_suite",
         ":cel_test_suite_exception",
         "//common:compiler_common",
+        "//common/annotations",
         "//common/formats:file_source",
         "//common/formats:parser_context",
         "//common/formats:yaml_helper",
@@ -163,10 +165,14 @@ java_library(
         ":result_matcher",
         "//:auto_value",
         "//bundle:cel",
+        "//common:cel_descriptor_util",
         "//common:options",
         "//policy:parser",
         "//runtime",
+        "//testing/testrunner:proto_descriptor_utils",
+        "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
@@ -223,6 +229,7 @@ java_library(
         ":cel_test_suite",
         ":cel_test_suite_exception",
         ":registry_utils",
+        "//common/annotations",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@cel_spec//proto/cel/expr/conformance/test:suite_java_proto",
         "@maven//:com_google_guava_guava",

diff --git a/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java b/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java
@@ -14,12 +14,23 @@
 package dev.cel.testing.testrunner;
 
 import com.google.auto.value.AutoValue;
+import com.google.auto.value.extension.memoized.Memoized;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.Descriptors.FileDescriptor;
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.TypeRegistry;
 import dev.cel.bundle.Cel;
 import dev.cel.bundle.CelFactory;
+import dev.cel.common.CelDescriptorUtil;
 import dev.cel.common.CelOptions;
 import dev.cel.policy.CelPolicyParser;
 import dev.cel.runtime.CelLateFunctionBindings;
+import dev.cel.testing.utils.ProtoDescriptorUtils;
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 
@@ -63,6 +74,19 @@ public abstract class CelTestContext {
    */
   public abstract Optional<CelLateFunctionBindings> celLateFunctionBindings();
 
+  /** Interface for transforming bindings before evaluation. */
+  @FunctionalInterface
+  public interface BindingTransformer {
+    ImmutableMap<String, Object> transform(ImmutableMap<String, Object> bindings) throws Exception;
+  }
+
+  /**
+   * The binding transformer for the CEL test.
+   *
+   * <p>This transformer is used to transform the bindings before evaluation.
+   */
+  public abstract Optional<BindingTransformer> bindingTransformer();
+
   /**
    * The variable bindings for the CEL test.
    *
@@ -99,6 +123,34 @@ public abstract class CelTestContext {
    */
   public abstract Optional<String> fileDescriptorSetPath();
 
+  abstract ImmutableSet<FileDescriptor> fileTypes();
+
+  @Memoized
+  public Optional<TypeRegistry> typeRegistry() {
+    if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
+      return Optional.empty();
+    }
+    TypeRegistry.Builder builder = TypeRegistry.newBuilder();
+    if (!fileTypes().isEmpty()) {
+      builder.add(
+          CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileTypes())
+              .messageTypeDescriptors());
+    }
+    if (fileDescriptorSetPath().isPresent()) {
+      try {
+        builder.add(
+            ProtoDescriptorUtils.getAllDescriptorsFromJvm(fileDescriptorSetPath().get())
+                .messageTypeDescriptors());
+      } catch (IOException e) {
+        throw new IllegalStateException(
+            "Failed to load descriptors from path: " + fileDescriptorSetPath().get(), e);
+      }
+    }
+    return Optional.of(builder.build());
+  }
+
+  public abstract Optional<ExtensionRegistry> extensionRegistry();
+
   /** Returns a builder for {@link CelTestContext} with the current instance's values. */
   public abstract Builder toBuilder();
 
@@ -123,6 +175,8 @@ public abstract static class Builder {
     public abstract Builder setCelLateFunctionBindings(
         CelLateFunctionBindings celLateFunctionBindings);
 
+    public abstract Builder setBindingTransformer(BindingTransformer bindingTransformer);
+
     public abstract Builder setVariableBindings(Map<String, Object> variableBindings);
 
     public abstract Builder setResultMatcher(ResultMatcher resultMatcher);
@@ -133,6 +187,34 @@ public abstract Builder setCelLateFunctionBindings(
 
     public abstract Builder setFileDescriptorSetPath(String fileDescriptorSetPath);
 
+    abstract ImmutableSet.Builder<FileDescriptor> fileTypesBuilder();
+
+    @CanIgnoreReturnValue
+    public Builder addMessageTypes(Descriptor... descriptors) {
+      return addMessageTypes(Arrays.asList(descriptors));
+    }
+
+    @CanIgnoreReturnValue
+    public Builder addMessageTypes(Iterable<Descriptor> descriptors) {
+      for (Descriptor descriptor : descriptors) {
+        addFileTypes(descriptor.getFile());
+      }
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder addFileTypes(FileDescriptor... fileDescriptors) {
+      return addFileTypes(Arrays.asList(fileDescriptors));
+    }
+
+    @CanIgnoreReturnValue
+    public Builder addFileTypes(Iterable<FileDescriptor> fileDescriptors) {
+      fileTypesBuilder().addAll(fileDescriptors);
+      return this;
+    }
+
+    public abstract Builder setExtensionRegistry(ExtensionRegistry extensionRegistry);
+
     public abstract CelTestContext build();
   }
 }
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/CelTestSuite.java b/testing/src/main/java/dev/cel/testing/testrunner/CelTestSuite.java
@@ -93,7 +93,7 @@ public abstract static class Builder {
     public abstract Builder toBuilder();
 
     public static Builder newBuilder() {
-      return new AutoValue_CelTestSuite_CelTestSection.Builder();
+      return new AutoValue_CelTestSuite_CelTestSection.Builder().setDescription("");
     }
 
     /** Class representing a CEL test case within a test section. */
@@ -237,7 +237,8 @@ public abstract static class Builder {
 
       public static Builder newBuilder() {
         return new AutoValue_CelTestSuite_CelTestSection_CelTestCase.Builder()
-            .setInput(Input.ofNoInput()); // Default input to no input.
+            .setInput(Input.ofNoInput()) // Default input to no input.
+            .setDescription("");
       }
     }
   }