Skip to content

Add file descriptor support in test runner #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 11, 2025
Merged

Add file descriptor support in test runner #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions testing/src/main/java/dev/cel/testing/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ package(
java_library(
name = "expr_value_utils",
srcs = ["ExprValueUtils.java"],
tags = [
],
deps = [
"//common",
"//common/internal:default_instance_message_factory",
Expand Down
35 changes: 17 additions & 18 deletions testing/src/main/java/dev/cel/testing/utils/ExprValueUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,6 @@ private ExprValueUtils() {}
public static final TypeRegistry DEFAULT_TYPE_REGISTRY = newDefaultTypeRegistry();
public static final ExtensionRegistry DEFAULT_EXTENSION_REGISTRY = newDefaultExtensionRegistry();

// TODO: Add support for user provided extensions.
private static ExtensionRegistry newDefaultExtensionRegistry() {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
dev.cel.expr.conformance.proto2.TestAllTypesExtensions.registerAllExtensions(extensionRegistry);

return extensionRegistry;
}

private static TypeRegistry newDefaultTypeRegistry() {
CelDescriptors allDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
ImmutableList.of(
dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor().getFile(),
dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor().getFile()));

return TypeRegistry.newBuilder().add(allDescriptors.messageTypeDescriptors()).build();
}

/**
* Converts a {@link Value} to a Java native object.
*
Expand Down Expand Up @@ -254,4 +236,21 @@ public static Value toValue(Object object, CelType type) throws Exception {
throw new IllegalArgumentException(
String.format("Unexpected result type: %s", object.getClass()));
}

private static ExtensionRegistry newDefaultExtensionRegistry() {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
dev.cel.expr.conformance.proto2.TestAllTypesExtensions.registerAllExtensions(extensionRegistry);

return extensionRegistry;
}

private static TypeRegistry newDefaultTypeRegistry() {
CelDescriptors allDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
ImmutableList.of(
dev.cel.expr.conformance.proto2.TestAllTypes.getDescriptor().getFile(),
dev.cel.expr.conformance.proto3.TestAllTypes.getDescriptor().getFile()));

return TypeRegistry.newBuilder().add(allDescriptors.messageTypeDescriptors()).build();
}
}