Add parsed-only evaluation coverage to Proto Extensions#1015

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
Apr 15, 2026
Merged

Add parsed-only evaluation coverage to Proto Extensions #1015

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
173 changes: 88 additions & 85 deletions extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

private static final CelCompiler CEL_COMPILER =
CelCompilerFactory.standardCelCompilerBuilder()
.addLibraries(CelExtensions.protos())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addFileTypes(TestAllTypesExtensions.getDescriptor())
.addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
.setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
.build();
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;

private static final CelRuntime CEL_RUNTIME =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addFileTypes(TestAllTypesExtensions.getDescriptor())
.build();
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.protos())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addFileTypes(TestAllTypesExtensions.getDescriptor())
.addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
.setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
.build();
}

private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
"{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
@TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
public void hasExt_packageScoped_success(String expr) throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
boolean result =
(boolean)
CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
"{expr: '!proto.hasExt(msg,"
+ " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
public void hasExt_messageScoped_success(String expr) throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
boolean result =
(boolean)
CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
StructTypeReference proto2MessageTypeReference =
StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addLibraries(CelExtensions.protos())
Cel customCel =
runtimeFlavor
.builder()
.addCompilerLibraries(CelExtensions.protos())
.addVar("msg", proto2MessageTypeReference)
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
SimpleType.BOOL,
ImmutableList.of(
proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addFunctionBindings(
CelFunctionBinding.from(
"msg_hasExt",
ImmutableList.of(TestAllTypes.class, String.class, Long.class),
(arg) -> {
TestAllTypes msg = (TestAllTypes) arg[0];
String extensionField = (String) arg[1];
return msg.getAllFields().keySet().stream()
.anyMatch(fd -> fd.getFullName().equals(extensionField));
}))
CelFunctionBinding.fromOverloads(
"hasExt",
CelFunctionBinding.from(
"msg_hasExt",
ImmutableList.of(TestAllTypes.class, String.class, Long.class),
(arg) -> {
TestAllTypes msg = (TestAllTypes) arg[0];
String extensionField = (String) arg[1];
return msg.getAllFields().keySet().stream()
.anyMatch(fd -> fd.getFullName().equals(extensionField));
})))
.build();

CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
boolean result =
(boolean)
celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
(boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}

@Test
public void hasExt_undefinedField_throwsException() {
// This is a type-checking failure
Assume.assumeFalse(isParseOnly);
CelValidationException exception =
assertThrows(
CelValidationException.class,
() ->
CEL_COMPILER
.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
.getAst());

assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
"{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
+ " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
public void getExt_packageScoped_success(String expr) throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
boolean result =
(boolean)
CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
"{expr: 'proto.getExt(msg,"
+ " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
public void getExt_messageScopedSuccess(String expr) throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
boolean result =
(boolean)
CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}

@Test
public void getExt_undefinedField_throwsException() {
// This is a type-checking failure
Assume.assumeFalse(isParseOnly);
CelValidationException exception =
assertThrows(
CelValidationException.class,
() ->
CEL_COMPILER
.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
.getAst());

assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
public void getExt_nonProtoNamespace_success(String expr) throws Exception {
StructTypeReference proto2MessageTypeReference =
StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addLibraries(CelExtensions.protos())
Cel customCel =
runtimeFlavor
.builder()
.addCompilerLibraries(CelExtensions.protos())
.addVar("msg", proto2MessageTypeReference)
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
SimpleType.DYN,
ImmutableList.of(
proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addFunctionBindings(
CelFunctionBinding.from(
"msg_getExt",
ImmutableList.of(TestAllTypes.class, String.class, Long.class),
(arg) -> {
TestAllTypes msg = (TestAllTypes) arg[0];
String extensionField = (String) arg[1];
FieldDescriptor extensionDescriptor =
msg.getAllFields().keySet().stream()
.filter(fd -> fd.getFullName().equals(extensionField))
.findAny()
.get();
return msg.getField(extensionDescriptor);
}))
CelFunctionBinding.fromOverloads(
"getExt",
CelFunctionBinding.from(
"msg_getExt",
ImmutableList.of(TestAllTypes.class, String.class, Long.class),
(arg) -> {
TestAllTypes msg = (TestAllTypes) arg[0];
String extensionField = (String) arg[1];
FieldDescriptor extensionDescriptor =
msg.getAllFields().keySet().stream()
.filter(fd -> fd.getFullName().equals(extensionField))
.findAny()
.get();
return msg.getField(extensionDescriptor);
})))
.build();

CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
boolean result =
(boolean)
celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
(boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

assertThat(result).isTrue();
}
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
public void getExt_onAnyPackedExtensionField_success() throws Exception {
ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
Cel cel =
CelFactory.standardCelBuilder()
Cel customCel =
runtimeFlavor
.builder()
// CEL-Internal-2
.addCompilerLibraries(CelExtensions.protos())
.addFileTypes(TestAllTypesExtensions.getDescriptor())
.setExtensionRegistry(extensionRegistry)
.addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
.build();
CelAbstractSyntaxTree ast =
cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
Any anyMsg =
Any.pack(
TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
Long result =
(Long)
eval(
customCel,
"proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
ImmutableMap.of("msg", anyMsg));

assertThat(result).isEqualTo(1);
}
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
@Test
public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
CelValidationException e =
assertThrows(
CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

assertThat(e).hasMessageThat().isEqualTo(testcase.error);
}

private Object eval(String expression, Map<String, ?> variables) throws Exception {
return eval(this.cel, expression, variables);
}

private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
CelAbstractSyntaxTree ast =
this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
return cel.createProgram(ast).eval(variables);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add parsed-only evaluation coverage to Proto Extensions#1015

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

Apr 15, 2026
 Merged


Add parsed-only evaluation coverage to Proto Extensions
#1015
 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


173 changes: 88 additions & 85 deletions
extensions/src/test/java/dev/cel/extensions/CelProtoExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
Expand All@@ -35,36 +34,42 @@
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedEnum;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import dev.cel.testing.CelRuntimeFlavor;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public final class CelProtoExtensionsTest {

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .build();
 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.protos())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .build();
 }

 private static final TestAllTypes PACKAGE_SCOPED_EXT_MSG =
 TestAllTypes.newBuilder()
Expand DownExpand Up@@ -106,10 +111,7 @@ public void library() {
 "{expr: 'proto.hasExt(msg, cel.expr.conformance.proto2.repeated_test_all_types)'}")
 @TestParameters("{expr: '!proto.hasExt(msg, cel.expr.conformance.proto2.test_all_types_ext)'}")
 public void hasExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -128,10 +130,7 @@ public void hasExt_packageScoped_success(String expr) throws Exception {
 "{expr: '!proto.hasExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.nested_enum_ext)'}")
 public void hasExt_messageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -142,9 +141,10 @@ public void hasExt_messageScoped_success(String expr) throws Exception {
 public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -154,37 +154,35 @@ public void hasExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.BOOL,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 }))
 CelFunctionBinding.fromOverloads(
 "hasExt",
 CelFunctionBinding.from(
 "msg_hasExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 return msg.getAllFields().keySet().stream()
 .anyMatch(fd -> fd.getFullName().equals(extensionField));
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void hasExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.hasExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -204,10 +202,7 @@ public void hasExt_undefinedField_throwsException() {
 "{expr: 'proto.getExt(msg, cel.expr.conformance.proto2.repeated_test_all_types) =="
 + " [TestAllTypes{single_string: ''A''}, TestAllTypes{single_string: ''B''}]'}")
 public void getExt_packageScoped_success(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -221,22 +216,20 @@ public void getExt_packageScoped_success(String expr) throws Exception {
 "{expr: 'proto.getExt(msg,"
 + " cel.expr.conformance.proto2.Proto2ExtensionScopedMessage.int64_ext) == 1'}")
 public void getExt_messageScopedSuccess(String expr) throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 boolean result =
 (boolean)
 CEL_RUNTIME.createProgram(ast).eval(ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));
 boolean result = (boolean) eval(expr, ImmutableMap.of("msg", MESSAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }

 @Test
 public void getExt_undefinedField_throwsException() {
 // This is a type-checking failure
 Assume.assumeFalse(isParseOnly);
 CelValidationException exception =
 assertThrows(
 CelValidationException.class,
 () ->
 CEL_COMPILER
 .compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 cel.compile("!proto.getExt(msg, cel.expr.conformance.proto2.undefined_field)")
 .getAst());

 assertThat(exception)
Expand All@@ -250,9 +243,10 @@ public void getExt_undefinedField_throwsException() {
 public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 StructTypeReference proto2MessageTypeReference =
 StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes");
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .addLibraries(CelExtensions.protos())
 Cel customCel =
 runtimeFlavor
 .builder()
 .addCompilerLibraries(CelExtensions.protos())
 .addVar("msg", proto2MessageTypeReference)
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
Expand All@@ -262,29 +256,26 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 SimpleType.DYN,
 ImmutableList.of(
 proto2MessageTypeReference, SimpleType.STRING, SimpleType.INT))))
 .build();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 }))
 CelFunctionBinding.fromOverloads(
 "getExt",
 CelFunctionBinding.from(
 "msg_getExt",
 ImmutableList.of(TestAllTypes.class, String.class, Long.class),
 (arg) -> {
 TestAllTypes msg = (TestAllTypes) arg[0];
 String extensionField = (String) arg[1];
 FieldDescriptor extensionDescriptor =
 msg.getAllFields().keySet().stream()
 .filter(fd -> fd.getFullName().equals(extensionField))
 .findAny()
 .get();
 return msg.getField(extensionDescriptor);
 })))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile(expr).getAst();
 boolean result =
 (boolean)
 celRuntime.createProgram(ast).eval(ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));
 (boolean) eval(customCel, expr, ImmutableMap.of("msg", PACKAGE_SCOPED_EXT_MSG));

 assertThat(result).isTrue();
 }
Expand All@@ -293,21 +284,24 @@ public void getExt_nonProtoNamespace_success(String expr) throws Exception {
 public void getExt_onAnyPackedExtensionField_success() throws Exception {
 ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
 TestAllTypesExtensions.registerAllExtensions(extensionRegistry);
 Cel cel =
 CelFactory.standardCelBuilder()
 Cel customCel =
 runtimeFlavor
 .builder()
 // CEL-Internal-2
 .addCompilerLibraries(CelExtensions.protos())
 .addFileTypes(TestAllTypesExtensions.getDescriptor())
 .setExtensionRegistry(extensionRegistry)
 .addVar("msg", StructTypeReference.create("cel.expr.conformance.proto2.TestAllTypes"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)").getAst();
 Any anyMsg =
 Any.pack(
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 1).build());

 Long result = (Long) cel.createProgram(ast).eval(ImmutableMap.of("msg", anyMsg));
 Long result =
 (Long)
 eval(
 customCel,
 "proto.getExt(msg, cel.expr.conformance.proto2.int32_ext)",
 ImmutableMap.of("msg", anyMsg));

 assertThat(result).isEqualTo(1);
 }
Expand DownExpand Up@@ -343,9 +337,18 @@ private enum ParseErrorTestCase {
 @Test
 public void parseErrors(@TestParameter ParseErrorTestCase testcase) {
 CelValidationException e =
 assertThrows(
 CelValidationException.class, () -> CEL_COMPILER.compile(testcase.expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.parse(testcase.expr).getAst());

 assertThat(e).hasMessageThat().isEqualTo(testcase.error);
 }

 private Object eval(String expression, Map<String, ?> variables) throws Exception {
 return eval(this.cel, expression, variables);
 }

 private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
 CelAbstractSyntaxTree ast =
 this.isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();
 return cel.createProgram(ast).eval(variables);
 }
}
Loading