Restructure Java test runner to not require JVM classinfo inspection for loading descriptors

l46kok · copybara-github · commit 33c0e54b0645 · 2026-04-16T15:08:05.000-07:00
PiperOrigin-RevId: 900811839
diff --git a/common/BUILD.bazel b/common/BUILD.bazel
@@ -118,6 +118,14 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
 )
 
+java_library(
+    name = "proto_java_qualified_names",
+    visibility = [
+        "//:internal",
+    ],
+    exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
+)
+
 java_library(
     name = "operator",
     exports = ["//common/src/main/java/dev/cel/common:operator"],
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
@@ -45,3 +45,8 @@ java_library(
     name = "expr_value_utils",
     exports = ["//testing/src/main/java/dev/cel/testing/utils:expr_value_utils"],
 )
+
+java_library(
+    name = "dynamic_default_instance_message_factory",
+    exports = ["//testing/src/main/java/dev/cel/testing/utils:dynamic_default_instance_message_factory"],
+)
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel b/testing/src/main/java/dev/cel/testing/testrunner/BUILD.bazel
@@ -86,6 +86,7 @@ java_library(
         ":cel_expression_source",
         ":cel_test_context",
         ":cel_test_suite",
+        ":proto_descriptor_utils",
         ":registry_utils",
         ":result_matcher",
         "//bundle:cel",
@@ -104,7 +105,6 @@ java_library(
         "//policy:validation_exception",
         "//runtime",
         "//testing:expr_value_utils",
-        "//testing/testrunner:proto_descriptor_utils",
         "@cel_spec//proto/cel/expr:expr_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -162,14 +162,14 @@ java_library(
     deps = [
         ":cel_expression_source",
         ":default_result_matcher",
+        ":proto_descriptor_utils",
         ":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",
@@ -182,8 +182,19 @@ java_library(
     tags = [
     ],
     deps = [
-        "//common/internal:default_instance_message_factory",
-        "//testing/testrunner:proto_descriptor_utils",
+        ":proto_descriptor_utils",
+        "//testing:dynamic_default_instance_message_factory",
+        "@maven//:com_google_protobuf_protobuf_java",
+    ],
+)
+
+java_library(
+    name = "proto_descriptor_utils",
+    srcs = ["ProtoDescriptorUtils.java"],
+    deps = [
+        "//common:cel_descriptor_util",
+        "//common:cel_descriptors",
+        "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java b/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java
@@ -28,7 +28,6 @@
 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;
@@ -139,7 +138,7 @@ public Optional<TypeRegistry> typeRegistry() {
     if (fileDescriptorSetPath().isPresent()) {
       try {
         builder.add(
-            ProtoDescriptorUtils.getAllDescriptorsFromJvm(fileDescriptorSetPath().get())
+            ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath().get())
                 .messageTypeDescriptors());
       } catch (IOException e) {
         throw new IllegalStateException(
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/ProtoDescriptorUtils.java b/testing/src/main/java/dev/cel/testing/testrunner/ProtoDescriptorUtils.java
@@ -0,0 +1,57 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dev.cel.testing.testrunner;
+
+import com.google.common.io.Files;
+import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
+import com.google.protobuf.ExtensionRegistry;
+import dev.cel.common.CelDescriptorUtil;
+import dev.cel.common.CelDescriptors;
+import java.io.File;
+import java.io.IOException;
+
+/** Utility class for working with proto descriptors. */
+final class ProtoDescriptorUtils {
+
+  private static CelDescriptors descriptors;
+  private static String lastPath;
+
+  /**
+   * Returns all the descriptors from the file descriptor set file.
+   *
+   * @return The {@link CelDescriptors} object containing all the descriptors.
+   */
+  static synchronized CelDescriptors getDescriptorsFromFile(String fileDescriptorSetPath)
+      throws IOException {
+    if (fileDescriptorSetPath.equals(lastPath) && descriptors != null) {
+      return descriptors;
+    }
+    FileDescriptorSet fileDescriptorSet = getFileDescriptorSet(fileDescriptorSetPath);
+    descriptors = CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
+        CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fileDescriptorSet));
+    lastPath = fileDescriptorSetPath;
+    return descriptors;
+  }
+
+  private static FileDescriptorSet getFileDescriptorSet(String fileDescriptorSetPath)
+      throws IOException {
+    // We can pass an empty extension registry here because extensions are recovered later when
+    // creating the extension registry in {@link #createExtensionRegistry}.
+    return FileDescriptorSet.parseFrom(
+        Files.toByteArray(new File(fileDescriptorSetPath)), ExtensionRegistry.newInstance());
+  }
+
+  private ProtoDescriptorUtils() {}
+}
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/RegistryUtils.java b/testing/src/main/java/dev/cel/testing/testrunner/RegistryUtils.java
@@ -13,13 +13,13 @@
 // limitations under the License.
 package dev.cel.testing.testrunner;
 
-import static dev.cel.testing.utils.ProtoDescriptorUtils.getAllDescriptorsFromJvm;
+
 
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
 import com.google.protobuf.TypeRegistry;
-import dev.cel.common.internal.DefaultInstanceMessageFactory;
+import dev.cel.testing.utils.DynamicDefaultInstanceMessageFactory;
 import java.io.IOException;
 import java.util.NoSuchElementException;
 
@@ -29,7 +29,7 @@ public final class RegistryUtils {
   /** Returns the {@link TypeRegistry} for the given file descriptor set. */
   public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
     return TypeRegistry.newBuilder()
-        .add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
+        .add(ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath).messageTypeDescriptors())
         .build();
   }
 
@@ -38,13 +38,13 @@ public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPat
       throws IOException {
     ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 
-    getAllDescriptorsFromJvm(fileDescriptorSetPath)
+    ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath)
         .extensionDescriptors()
         .forEach(
             (descriptorName, descriptor) -> {
               if (descriptor.getType().equals(FieldDescriptor.Type.MESSAGE)) {
                 Message output =
-                    DefaultInstanceMessageFactory.getInstance()
+                    DynamicDefaultInstanceMessageFactory.getInstance()
                         .getPrototype(descriptor.getMessageType())
                         .orElseThrow(
                             () ->
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/TestExecutor.java b/testing/src/main/java/dev/cel/testing/testrunner/TestExecutor.java
@@ -236,6 +236,8 @@ public String describe() {
           testResult.setStatus(JUnitXmlReporter.TestResult.FAILURE);
           testResult.setThrowable(result.getFailures().get(0).getException());
           testReporter.onTestFailure(testResult);
+          System.err.println("Test failed: " + testName);
+          result.getFailures().forEach(failure -> failure.getException().printStackTrace());
         }
       }
     }
diff --git a/testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java b/testing/src/main/java/dev/cel/testing/testrunner/TestRunnerLibrary.java
@@ -52,7 +52,6 @@
 import dev.cel.testing.testrunner.CelTestSuite.CelTestSection.CelTestCase;
 import dev.cel.testing.testrunner.CelTestSuite.CelTestSection.CelTestCase.Input.Binding;
 import dev.cel.testing.testrunner.ResultMatcher.ResultMatcherParams;
-import dev.cel.testing.utils.ProtoDescriptorUtils;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -206,7 +205,7 @@ private static Cel extendCel(CelTestContext celTestContext, CelOptions celOption
           extendedCel
               .toCelBuilder()
               .addMessageTypes(
-                  ProtoDescriptorUtils.getAllDescriptorsFromJvm(
+                  ProtoDescriptorUtils.getDescriptorsFromFile(
                           celTestContext.fileDescriptorSetPath().get())
                       .messageTypeDescriptors())
               .setExtensionRegistry(
diff --git a/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel b/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
@@ -15,9 +15,7 @@ java_library(
     tags = [
     ],
     deps = [
-        "//common:cel_descriptor_util",
-        "//common:cel_descriptors",
-        "//common/internal:default_instance_message_factory",
+        ":dynamic_default_instance_message_factory",
         "//common/internal:proto_time_utils",
         "//common/types",
         "//common/types:type_providers",
@@ -26,8 +24,6 @@ java_library(
         "//runtime:unknown_attributes",
         "//testing/testrunner:registry_utils",
         "@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",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven_android//:com_google_protobuf_protobuf_javalite",
@@ -41,21 +37,19 @@ java_library(
     ],
     deps = [
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:io_github_classgraph_classgraph",
     ],
 )
 
 java_library(
-    name = "proto_descriptor_utils",
-    srcs = ["ProtoDescriptorUtils.java"],
-    tags = [
+    name = "dynamic_default_instance_message_factory",
+    srcs = ["DynamicDefaultInstanceMessageFactory.java"],
+    visibility = [
+        "//testing:__pkg__",
+        "//testing/src/main/java/dev/cel/testing/testrunner:__pkg__",
     ],
     deps = [
-        "//common:cel_descriptor_util",
-        "//common:cel_descriptors",
-        "//testing/testrunner:class_loader_utils",
-        "@maven//:com_google_guava_guava",
+        "//common:proto_java_qualified_names",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/testing/src/main/java/dev/cel/testing/utils/ClassLoaderUtils.java b/testing/src/main/java/dev/cel/testing/utils/ClassLoaderUtils.java
@@ -15,51 +15,19 @@
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.Descriptors.Descriptor;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfo;
 import io.github.classgraph.ClassInfoList;
 import io.github.classgraph.ScanResult;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Logger;
 
 /** Utility class for loading classes using {@link ClassGraph}. */
 public final class ClassLoaderUtils {
 
-  private static final Logger logger = Logger.getLogger(ClassLoaderUtils.class.getName());
-
   // Using `enableAllInfo()` to scan all class files upfront. This avoids repeated parsing
   // of class files by individual methods, improving efficiency.
   private static final Supplier<ScanResult> CLASS_SCAN_RESULT =
       Suppliers.memoize(() -> new ClassGraph().enableAllInfo().scan());
 
-  /**
-   * Loads all descriptor type classes from the JVM.
-   *
-   * @return A list of {@link Descriptor} objects representing the descriptors loaded from the JVM.
-   * @throws IOException If there is an error during the loading process.
-   */
-  public static ImmutableList<Descriptor> loadDescriptors() throws IOException {
-    ClassInfoList classInfoList = CLASS_SCAN_RESULT.get().getAllStandardClasses();
-    ImmutableList.Builder<Descriptor> compileTimeLoadedDescriptors = ImmutableList.builder();
-
-    for (ClassInfo classInfo : classInfoList) {
-      try {
-        Class<?> classInfoClass = classInfo.loadClass();
-        Descriptor descriptor = (Descriptor) classInfoClass.getMethod("getDescriptor").invoke(null);
-        compileTimeLoadedDescriptors.add(descriptor);
-      } catch (InvocationTargetException e) {
-        logger.severe(
-            "Failed to load descriptor: " + classInfo.getName() + " with error: " + e);
-      } catch (Exception e) {
-        // Ignore classes that do not have a getDescriptor method.
-      }
-    }
-    return compileTimeLoadedDescriptors.build();
-  }
-
   /**
    * Loads all subclasses of the given class from the JVM.
    *
diff --git a/testing/src/main/java/dev/cel/testing/utils/DynamicDefaultInstanceMessageFactory.java b/testing/src/main/java/dev/cel/testing/utils/DynamicDefaultInstanceMessageFactory.java
@@ -0,0 +1,67 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dev.cel.testing.utils;
+
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.Message;
+import dev.cel.common.internal.ProtoJavaQualifiedNames;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Factory for creating default instances of protobuf messages using reflection, bypassing
+ * descriptor reference equality checks.
+ *
+ * <p>This factory is intended for testing purposes only. It is needed because descriptors loaded
+ * from file descriptor sets (e.g., at build time or from tests) do not share the same object
+ * instance as the descriptors loaded by the JVM for the compiled classes. The standard {@link
+ * dev.cel.common.internal.DefaultInstanceMessageFactory} enforces reference equality for
+ * descriptors to guarantee type safety, which fails for file-loaded descriptors. This factory
+ * bypasses that check by using reflection to call {@code getDefaultInstance} on the class found by
+ * name.
+ */
+public final class DynamicDefaultInstanceMessageFactory {
+
+  private static final DynamicDefaultInstanceMessageFactory INSTANCE =
+      new DynamicDefaultInstanceMessageFactory();
+  private final ConcurrentHashMap<String, Optional<Message>> cache = new ConcurrentHashMap<>();
+
+  public static DynamicDefaultInstanceMessageFactory getInstance() {
+    return INSTANCE;
+  }
+
+  public Optional<Message> getPrototype(Descriptor descriptor) {
+    String className = ProtoJavaQualifiedNames.getFullyQualifiedJavaClassName(descriptor);
+    return cache.computeIfAbsent(
+        className,
+        k -> {
+          try {
+            Class<?> clazz = Class.forName(k);
+            Method method = clazz.getMethod("getDefaultInstance");
+            return Optional.of((Message) method.invoke(null));
+          } catch (ClassNotFoundException
+              | NoSuchMethodException
+              | IllegalAccessException
+              | InvocationTargetException e) {
+            // Fallback or ignore
+            return Optional.empty();
+          }
+        });
+  }
+
+  private DynamicDefaultInstanceMessageFactory() {}
+}
diff --git a/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java b/testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java
diff --git a/testing/src/main/java/dev/cel/testing/utils/ProtoDescriptorUtils.java b/testing/src/main/java/dev/cel/testing/utils/ProtoDescriptorUtils.java

Original file line number	Diff line number	Diff line change
`@@ -45,3 +45,8 @@ java_library(`
`45`	`45`	`name = "expr_value_utils",`
`46`	`46`	`exports = ["//testing/src/main/java/dev/cel/testing/utils:expr_value_utils"],`
`47`	`47`	`)`
	`48`	`+`
	`49`	`+java_library(`
	`50`	`+ name = "dynamic_default_instance_message_factory",`
	`51`	`+ exports = ["//testing/src/main/java/dev/cel/testing/utils:dynamic_default_instance_message_factory"],`
	`52`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,8 @@ public String describe() {`
`236`	`236`	`testResult.setStatus(JUnitXmlReporter.TestResult.FAILURE);`
`237`	`237`	`testResult.setThrowable(result.getFailures().get(0).getException());`
`238`	`238`	`testReporter.onTestFailure(testResult);`
	`239`	`+ System.err.println("Test failed: " + testName);`
	`240`	`+ result.getFailures().forEach(failure -> failure.getException().printStackTrace());`
`239`	`241`	`}`
`240`	`242`	`}`
`241`	`243`	`}`