Add parsed-only evaluation test coverage to Regex Extensions

PiperOrigin-RevId: 899219077

Author: l46kok

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

@@ -17,7 +17,6 @@ java_library(
     deps = [
         "//:java_truth",
         "//bundle:cel",
-        "//bundle:cel_experimental_factory",
         "//bundle:cel_impl",
         "//bundle:environment",
         "//bundle:environment_exception",
@@ -56,6 +55,7 @@ java_library(
         "//runtime:evaluation_listener",
         "//runtime:function_binding",
         "//runtime:unknown_attributes",
+        "//testing:cel_runtime_flavor",
         "//testing/protos:single_file_extension_java_proto",
         "//testing/protos:single_file_java_proto",
         "@cel_spec//proto/cel/expr:checked_java_proto",

bundle/src/test/java/dev/cel/bundle/CelImplTest.java

@@ -114,6 +114,7 @@
 import dev.cel.runtime.CelUnknownSet;
 import dev.cel.runtime.CelVariableResolver;
 import dev.cel.runtime.UnknownContext;
+import dev.cel.testing.CelRuntimeFlavor;
 import dev.cel.testing.testdata.SingleFile;
 import dev.cel.testing.testdata.SingleFileExtensionsProto;
 import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
@@ -2144,8 +2145,9 @@ public void toBuilder_isImmutable() {
   }
 
   @Test
-  public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
-    Cel cel = runtimeEnv.cel;
+  public void eval_withJsonFieldName(@TestParameter CelRuntimeFlavor runtimeFlavor)
+      throws Exception {
+    Cel cel = setupEnv(runtimeFlavor.builder());
     CelAbstractSyntaxTree ast =
         cel.compile(
                 "file.int32_snake_case_json_name == 1 && "
@@ -2176,8 +2178,9 @@ public void eval_withJsonFieldName(@TestParameter RuntimeEnv runtimeEnv) throws
   }
 
   @Test
-  public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
-    Cel cel = runtimeEnv.cel;
+  public void eval_withJsonFieldName_fieldsFallBack(@TestParameter CelRuntimeFlavor runtimeFlavor)
+      throws Exception {
+    Cel cel = setupEnv(runtimeFlavor.builder());
     CelAbstractSyntaxTree ast =
         cel.compile(
                 "dyn(file).int32_snake_case_json_name == 1 && "
@@ -2206,8 +2209,9 @@ public void eval_withJsonFieldName_fieldsFallBack(@TestParameter RuntimeEnv runt
   }
 
   @Test
-  public void eval_withJsonFieldName_extensionFields(@TestParameter RuntimeEnv runtimeEnv) throws Exception {
-    Cel cel = runtimeEnv.cel;
+  public void eval_withJsonFieldName_extensionFields(@TestParameter CelRuntimeFlavor runtimeFlavor)
+      throws Exception {
+    Cel cel = setupEnv(runtimeFlavor.builder());
     CelAbstractSyntaxTree ast =
         cel.compile(
                 "proto.getExt(file, dev.cel.testing.testdata.int64CamelCaseJsonName) == 5 &&"
@@ -2317,33 +2321,21 @@ private static TypeProvider aliasingProvider(ImmutableMap<String, Type> typeAlia
     };
   }
 
-  private enum RuntimeEnv {
-    LEGACY(setupEnv(CelFactory.standardCelBuilder())),
-    PLANNER(setupEnv(CelExperimentalFactory.plannerCelBuilder()))
-    ;
-
-    private final Cel cel;
-
-    private static Cel setupEnv(CelBuilder celBuilder) {
-      ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-      SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
-      return celBuilder
-          .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
-          .addMessageTypes(SingleFile.getDescriptor())
-          .addFileTypes(SingleFileExtensionsProto.getDescriptor())
-          .addCompilerLibraries(CelExtensions.protos())
-          .setExtensionRegistry(extensionRegistry)
-          .setOptions(
-              CelOptions.current()
-                  .enableJsonFieldNames(true)
-                  .enableHeterogeneousNumericComparisons(true)
-                  .enableQuotedIdentifierSyntax(true)
-                  .build())
-          .build();
-    }
-
-    RuntimeEnv(Cel cel) {
-      this.cel = cel;
-    }
+  private static Cel setupEnv(CelBuilder celBuilder) {
+    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
+    SingleFileExtensionsProto.registerAllExtensions(extensionRegistry);
+    return celBuilder
+        .addVar("file", StructTypeReference.create(SingleFile.getDescriptor().getFullName()))
+        .addMessageTypes(SingleFile.getDescriptor())
+        .addFileTypes(SingleFileExtensionsProto.getDescriptor())
+        .addCompilerLibraries(CelExtensions.protos())
+        .setExtensionRegistry(extensionRegistry)
+        .setOptions(
+            CelOptions.current()
+                .enableJsonFieldNames(true)
+                .enableHeterogeneousNumericComparisons(true)
+                .enableQuotedIdentifierSyntax(true)
+                .build())
+        .build();
   }
 }

extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java

@@ -118,29 +118,18 @@ public void setRuntimeOptions(CelRuntimeBuilder runtimeBuilder) {
   @Override
   public void setRuntimeOptions(
       CelRuntimeBuilder runtimeBuilder, RuntimeEquality runtimeEquality, CelOptions celOptions) {
-    for (Function function : functions) {
-      for (CelOverloadDecl overload : function.functionDecl.overloads()) {
-        switch (overload.overloadId()) {
-          case MAP_INSERT_OVERLOAD_MAP_MAP:
-            runtimeBuilder.addFunctionBindings(
-                CelFunctionBinding.from(
-                    MAP_INSERT_OVERLOAD_MAP_MAP,
-                    Map.class,
-                    Map.class,
-                    (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)));
-            break;
-          case MAP_INSERT_OVERLOAD_KEY_VALUE:
-            runtimeBuilder.addFunctionBindings(
-                CelFunctionBinding.from(
-                    MAP_INSERT_OVERLOAD_KEY_VALUE,
-                    ImmutableList.of(Map.class, Object.class, Object.class),
-                    args -> mapInsertKeyValue(args, runtimeEquality)));
-            break;
-          default:
-            // Nothing to add.
-        }
-      }
-    }
+    runtimeBuilder.addFunctionBindings(
+        CelFunctionBinding.fromOverloads(
+            MAP_INSERT_FUNCTION,
+            CelFunctionBinding.from(
+                MAP_INSERT_OVERLOAD_MAP_MAP,
+                Map.class,
+                Map.class,
+                (map1, map2) -> mapInsertMap(map1, map2, runtimeEquality)),
+            CelFunctionBinding.from(
+                MAP_INSERT_OVERLOAD_KEY_VALUE,
+                ImmutableList.of(Map.class, Object.class, Object.class),
+                args -> mapInsertKeyValue(args, runtimeEquality))));
   }
 
   @Override

extensions/src/test/java/dev/cel/extensions/CelRegexExtensionsTest.java

@@ -20,25 +20,38 @@
 import com.google.testing.junit.testparameterinjector.TestParameter;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
+import dev.cel.bundle.Cel;
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelOptions;
-import dev.cel.compiler.CelCompiler;
-import dev.cel.compiler.CelCompilerFactory;
 import dev.cel.runtime.CelEvaluationException;
-import dev.cel.runtime.CelRuntime;
-import dev.cel.runtime.CelRuntimeFactory;
+import dev.cel.testing.CelRuntimeFlavor;
 import java.util.Optional;
+import org.junit.Assume;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(TestParameterInjector.class)
 public final class CelRegexExtensionsTest {
 
-  private static final CelCompiler COMPILER =
-      CelCompilerFactory.standardCelCompilerBuilder().addLibraries(CelExtensions.regex()).build();
-  private static final CelRuntime RUNTIME =
-      CelRuntimeFactory.standardCelRuntimeBuilder().addLibraries(CelExtensions.regex()).build();
+  @TestParameter public CelRuntimeFlavor runtimeFlavor;
+  @TestParameter public boolean isParseOnly;
+
+  private Cel cel;
+
+  @Before
+  public void setUp() {
+    // Legacy runtime does not support parsed-only evaluation mode.
+    Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.LEGACY) && isParseOnly);
+    this.cel =
+        runtimeFlavor
+            .builder()
+            .addCompilerLibraries(CelExtensions.regex())
+            .addRuntimeLibraries(CelExtensions.regex())
+            .build();
+  }
+
 
   @Test
   public void library() {
@@ -80,11 +93,7 @@ public void library() {
   public void replaceAll_success(String target, String regex, String replaceStr, String res)
       throws Exception {
     String expr = String.format("regex.replace('%s', '%s', '%s')", target, regex, replaceStr);
-    CelRuntime.Program program = RUNTIME.createProgram(COMPILER.compile(expr).getAst());
-
-    Object result = program.eval();
-
-    assertThat(result).isEqualTo(res);
+    assertThat(eval(expr)).isEqualTo(res);
   }
 
   @Test
@@ -93,11 +102,7 @@ public void replace_nested_success() throws Exception {
         "regex.replace("
             + "    regex.replace('%(foo) %(bar) %2','%\\\\((\\\\w+)\\\\)','${\\\\1}'),"
             + "    '%(\\\\d+)', '$\\\\1')";
-    CelRuntime.Program program = RUNTIME.createProgram(COMPILER.compile(expr).getAst());
-
-    Object result = program.eval();
-
-    assertThat(result).isEqualTo("${foo} ${bar} $2");
+    assertThat(eval(expr)).isEqualTo("${foo} ${bar} $2");
   }
 
   @Test
@@ -118,11 +123,7 @@ public void replace_nested_success() throws Exception {
   public void replaceCount_success(String t, String re, String rep, long i, String res)
       throws Exception {
     String expr = String.format("regex.replace('%s', '%s', '%s', %d)", t, re, rep, i);
-    CelRuntime.Program program = RUNTIME.createProgram(COMPILER.compile(expr).getAst());
-
-    Object result = program.eval();
-
-    assertThat(result).isEqualTo(res);
+    assertThat(eval(expr)).isEqualTo(res);
   }
 
   @Test
@@ -131,10 +132,8 @@ public void replaceCount_success(String t, String re, String rep, long i, String
   public void replace_invalidRegex_throwsException(String target, String regex, String replaceStr)
       throws Exception {
     String expr = String.format("regex.replace('%s', '%s', '%s')", target, regex, replaceStr);
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e).hasCauseThat().hasMessageThat().contains("Failed to compile regex: ");
@@ -143,10 +142,8 @@ public void replace_invalidRegex_throwsException(String target, String regex, St
   @Test
   public void replace_invalidCaptureGroupReplaceStr_throwsException() throws Exception {
     String expr = "regex.replace('test', '(.)', '\\\\2')";
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e)
@@ -158,10 +155,8 @@ public void replace_invalidCaptureGroupReplaceStr_throwsException() throws Excep
   @Test
   public void replace_trailingBackslashReplaceStr_throwsException() throws Exception {
     String expr = "regex.replace('id=123', 'id=(?P<value>\\\\d+)', '\\\\')";
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e)
@@ -173,10 +168,8 @@ public void replace_trailingBackslashReplaceStr_throwsException() throws Excepti
   @Test
   public void replace_invalidGroupReferenceReplaceStr_throwsException() throws Exception {
     String expr = "regex.replace('id=123', 'id=(?P<value>\\\\d+)', '\\\\a')";
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e)
@@ -199,9 +192,7 @@ public void replace_invalidGroupReferenceReplaceStr_throwsException() throws Exc
   @TestParameters("{target: 'brand', regex: 'brand', expectedResult: 'brand'}")
   public void extract_success(String target, String regex, String expectedResult) throws Exception {
     String expr = String.format("regex.extract('%s', '%s')", target, regex);
-    CelRuntime.Program program = RUNTIME.createProgram(COMPILER.compile(expr).getAst());
-
-    Object result = program.eval();
+    Object result = eval(expr);
 
     assertThat(result).isInstanceOf(Optional.class);
     assertThat((Optional<?>) result).hasValue(expectedResult);
@@ -213,9 +204,7 @@ public void extract_success(String target, String regex, String expectedResult)
   @TestParameters("{target: '', regex: '\\\\w+'}")
   public void extract_no_match(String target, String regex) throws Exception {
     String expr = String.format("regex.extract('%s', '%s')", target, regex);
-    CelRuntime.Program program = RUNTIME.createProgram(COMPILER.compile(expr).getAst());
-
-    Object result = program.eval();
+    Object result = eval(expr);
 
     assertThat(result).isInstanceOf(Optional.class);
     assertThat((Optional<?>) result).isEmpty();
@@ -227,10 +216,8 @@ public void extract_no_match(String target, String regex) throws Exception {
   public void extract_multipleCaptureGroups_throwsException(String target, String regex)
       throws Exception {
     String expr = String.format("regex.extract('%s', '%s')", target, regex);
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e)
@@ -263,9 +250,7 @@ private enum ExtractAllTestCase {
 
   @Test
   public void extractAll_success(@TestParameter ExtractAllTestCase testCase) throws Exception {
-    CelAbstractSyntaxTree ast = COMPILER.compile(testCase.expr).getAst();
-
-    Object result = RUNTIME.createProgram(ast).eval();
+    Object result = eval(testCase.expr);
 
     assertThat(result).isEqualTo(testCase.expectedResult);
   }
@@ -281,15 +266,19 @@ public void extractAll_success(@TestParameter ExtractAllTestCase testCase) throw
   public void extractAll_multipleCaptureGroups_throwsException(String target, String regex)
       throws Exception {
     String expr = String.format("regex.extractAll('%s', '%s')", target, regex);
-    CelAbstractSyntaxTree ast = COMPILER.compile(expr).getAst();
-
     CelEvaluationException e =
-        assertThrows(CelEvaluationException.class, () -> RUNTIME.createProgram(ast).eval());
+        assertThrows(CelEvaluationException.class, () -> eval(expr));
 
     assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
     assertThat(e)
         .hasCauseThat()
         .hasMessageThat()
         .contains("Regular expression has more than one capturing group:");
   }
+
+  private Object eval(String expr) throws Exception {
+    CelAbstractSyntaxTree ast =
+        isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
+    return cel.createProgram(ast).eval();
+  }
 }

optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel

@@ -11,7 +11,6 @@ java_library(
     deps = [
         #         "//java/com/google/testing/testsize:annotations",
         "//bundle:cel",
-        "//bundle:cel_experimental_factory",
         "//common:cel_ast",
         "//common:cel_source",
         "//common:compiler_common",
@@ -37,6 +36,7 @@ java_library(
         "//runtime:program",
         "//runtime:unknown_attributes",
         "//testing:baseline_test_case",
+        "//testing:cel_runtime_flavor",
         "@maven//:junit_junit",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "//:java_truth",