Fix accu_init to be lazily initialized in folder. Add parsed-only evaluation test coverage to Bindings Extensions

PiperOrigin-RevId: 899222077

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/BUILD.bazel

@@ -40,6 +40,7 @@ java_library(
         "//runtime:lite_runtime_factory",
         "//runtime:partial_vars",
         "//runtime:unknown_attributes",
+        "//testing:cel_runtime_flavor",
         "@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",