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

PiperOrigin-RevId: 900811839

Author: l46kok

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -396,18 +396,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "proto_java_qualified_names",
-    srcs = ["ProtoJavaQualifiedNames.java"],
-    tags = [
-    ],
-    deps = [
-        "//common/annotations",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
-    ],
-)
-
 java_library(
     name = "reflection_util",
     srcs = ["ReflectionUtil.java"],

testing/BUILD.bazel

@@ -45,3 +45,13 @@ 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"],
+)
+
+java_library(
+    name = "proto_descriptor_utils",
+    exports = ["//testing/src/main/java/dev/cel/testing/testrunner:proto_descriptor_utils"],
+)

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",
     ],
 )

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

@@ -25,10 +25,10 @@
 import dev.cel.bundle.Cel;
 import dev.cel.bundle.CelFactory;
 import dev.cel.common.CelDescriptorUtil;
+import dev.cel.common.CelDescriptors;
 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;
@@ -125,6 +125,19 @@ public interface BindingTransformer {
 
   abstract ImmutableSet<FileDescriptor> fileTypes();
 
+  @Memoized
+  public Optional<CelDescriptors> celDescriptors() {
+    if (fileDescriptorSetPath().isPresent()) {
+      try {
+        return Optional.of(ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath().get()));
+      } catch (IOException e) {
+        throw new IllegalStateException(
+            "Failed to load descriptors from path: " + fileDescriptorSetPath().get(), e);
+      }
+    }
+    return Optional.empty();
+  }
+
   @Memoized
   public Optional<TypeRegistry> typeRegistry() {
     if (fileTypes().isEmpty() && !fileDescriptorSetPath().isPresent()) {
@@ -136,15 +149,8 @@ public Optional<TypeRegistry> typeRegistry() {
           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);
-      }
+    if (celDescriptors().isPresent()) {
+      builder.add(celDescriptors().get().messageTypeDescriptors());
     }
     return Optional.of(builder.build());
   }

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

@@ -22,6 +22,7 @@
 import com.google.protobuf.TextFormat;
 import com.google.protobuf.TextFormat.ParseException;
 import com.google.protobuf.TypeRegistry;
+import dev.cel.common.CelDescriptors;
 import dev.cel.common.annotations.Internal;
 import dev.cel.expr.conformance.test.InputValue;
 import dev.cel.expr.conformance.test.TestCase;
@@ -71,8 +72,9 @@ private TestSuite parseTestSuite(
     TypeRegistry typeRegistry = customTypeRegistry;
     ExtensionRegistry extensionRegistry = customExtensionRegistry;
     if (fileDescriptorSetPath != null) {
-      extensionRegistry = RegistryUtils.getExtensionRegistry(fileDescriptorSetPath);
-      typeRegistry = RegistryUtils.getTypeRegistry(fileDescriptorSetPath);
+      CelDescriptors descriptors = ProtoDescriptorUtils.getDescriptorsFromFile(fileDescriptorSetPath);
+      extensionRegistry = RegistryUtils.getExtensionRegistry(descriptors);
+      typeRegistry = RegistryUtils.getTypeRegistry(descriptors);
     }
     TextFormat.Parser parser = TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
     TestSuite.Builder builder = TestSuite.newBuilder();

…/testing/utils/ProtoDescriptorUtils.java …ing/testrunner/ProtoDescriptorUtils.javatesting/src/main/java/dev/cel/testing/utils/ProtoDescriptorUtils.java renamed to testing/src/main/java/dev/cel/testing/testrunner/ProtoDescriptorUtils.java testing/src/main/java/dev/cel/testing/utils/ProtoDescriptorUtils.java renamed to testing/src/main/java/dev/cel/testing/testrunner/ProtoDescriptorUtils.java

@@ -1,4 +1,4 @@
-// Copyright 2025 Google LLC
+// 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.
@@ -11,18 +11,11 @@
 // 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 static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static dev.cel.testing.utils.ClassLoaderUtils.loadDescriptors;
+package dev.cel.testing.testrunner;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Files;
 import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
 import com.google.protobuf.ExtensionRegistry;
 import dev.cel.common.CelDescriptorUtil;
 import dev.cel.common.CelDescriptors;
@@ -33,30 +26,15 @@
 public final class ProtoDescriptorUtils {
 
   /**
-   * Returns all the descriptors from the JVM.
+   * Returns all the descriptors from the file descriptor set file.
    *
    * @return The {@link CelDescriptors} object containing all the descriptors.
    */
-  public static CelDescriptors getAllDescriptorsFromJvm(String fileDescriptorSetPath)
+  public static CelDescriptors getDescriptorsFromFile(String fileDescriptorSetPath)
       throws IOException {
-    ImmutableList<Descriptor> compileTimeLoadedDescriptors = loadDescriptors();
     FileDescriptorSet fileDescriptorSet = getFileDescriptorSet(fileDescriptorSetPath);
-    ImmutableSet<String> runtimeFileDescriptorNames =
-        CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fileDescriptorSet).stream()
-            .map(FileDescriptor::getFullName)
-            .collect(toImmutableSet());
-
-    // Get all the file descriptors from the descriptors which are loaded from the JVM and use the
-    // ones which match the ones provided by the user in the file descriptor set.
-    ImmutableList<FileDescriptor> userProvidedFileDescriptors =
-        CelDescriptorUtil.getFileDescriptorsForDescriptors(compileTimeLoadedDescriptors).stream()
-            .filter(
-                fileDescriptor -> runtimeFileDescriptorNames.contains(fileDescriptor.getFullName()))
-            .collect(toImmutableList());
-
-    // Get all the descriptors from the file descriptors above which include nested, extension and
-    // message type descriptors as well.
-    return CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(userProvidedFileDescriptors);
+    return CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
+        CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fileDescriptorSet));
   }
 
   private static FileDescriptorSet getFileDescriptorSet(String fileDescriptorSetPath)

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

@@ -13,38 +13,37 @@
 // 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 java.io.IOException;
+import dev.cel.common.CelDescriptors;
+import dev.cel.testing.utils.DynamicDefaultInstanceMessageFactory;
 import java.util.NoSuchElementException;
 
 /** Utility class for creating registries from a file descriptor set. */
 public final class RegistryUtils {
 
   /** Returns the {@link TypeRegistry} for the given file descriptor set. */
-  public static TypeRegistry getTypeRegistry(String fileDescriptorSetPath) throws IOException {
+  public static TypeRegistry getTypeRegistry(CelDescriptors descriptors) {
     return TypeRegistry.newBuilder()
-        .add(getAllDescriptorsFromJvm(fileDescriptorSetPath).messageTypeDescriptors())
+        .add(descriptors.messageTypeDescriptors())
         .build();
   }
 
   /** Returns the {@link ExtensionRegistry} for the given file descriptor set. */
-  public static ExtensionRegistry getExtensionRegistry(String fileDescriptorSetPath)
-      throws IOException {
+  public static ExtensionRegistry getExtensionRegistry(CelDescriptors descriptors) {
     ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 
-    getAllDescriptorsFromJvm(fileDescriptorSetPath)
+    descriptors
         .extensionDescriptors()
         .forEach(
             (descriptorName, descriptor) -> {
               if (descriptor.getType().equals(FieldDescriptor.Type.MESSAGE)) {
                 Message output =
-                    DefaultInstanceMessageFactory.getInstance()
+                    DynamicDefaultInstanceMessageFactory.getInstance()
                         .getPrototype(descriptor.getMessageType())
                         .orElseThrow(
                             () ->

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

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,11 +205,9 @@ private static Cel extendCel(CelTestContext celTestContext, CelOptions celOption
           extendedCel
               .toCelBuilder()
               .addMessageTypes(
-                  ProtoDescriptorUtils.getAllDescriptorsFromJvm(
-                          celTestContext.fileDescriptorSetPath().get())
-                      .messageTypeDescriptors())
+                  celTestContext.celDescriptors().get().messageTypeDescriptors())
               .setExtensionRegistry(
-                  RegistryUtils.getExtensionRegistry(celTestContext.fileDescriptorSetPath().get()))
+                  RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()))
               .build();
     }
 
@@ -369,13 +366,13 @@ private static Message unpackAny(Any any, CelTestContext celTestContext) throws
           "Proto descriptors are required for unpacking Any messages.");
     }
     Descriptor descriptor =
-        RegistryUtils.getTypeRegistry(celTestContext.fileDescriptorSetPath().get())
+        RegistryUtils.getTypeRegistry(celTestContext.celDescriptors().get())
             .getDescriptorForTypeUrl(any.getTypeUrl());
     return getDefaultInstance(descriptor)
         .getParserForType()
         .parseFrom(
             any.getValue(),
-            RegistryUtils.getExtensionRegistry(celTestContext.fileDescriptorSetPath().get()));
+            RegistryUtils.getExtensionRegistry(celTestContext.celDescriptors().get()));
   }
 
   private static Message getDefaultInstance(Descriptor descriptor) throws IOException {

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,15 @@ 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"],
     deps = [
-        "//common:cel_descriptor_util",
-        "//common:cel_descriptors",
-        "//testing/testrunner:class_loader_utils",
-        "@maven//:com_google_guava_guava",
+        "//common/internal:proto_java_qualified_names",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )