Internal Changes

PiperOrigin-RevId: 890081732

Author: l46kok

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();
     }
   }

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("");
       }
     }
   }

testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java

@@ -106,6 +106,13 @@ public static void runTest(
     }
   }
 
+  /** Runs the test with the provided AST. */
+  public static void runTest(
+      CelAbstractSyntaxTree ast, CelTestCase testCase, CelTestContext celTestContext)
+      throws Exception {
+    evaluate(ast, testCase, celTestContext, /* celCoverageIndex= */ null);
+  }
+
   @VisibleForTesting
   static void evaluateTestCase(CelTestCase testCase, CelTestContext celTestContext)
       throws Exception {