Add parsed-only evaluation coverage to Comprehensions Extensions#1018

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 Comprehensions Extensions #1018

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 79 additions & 71 deletions extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

private static final CelOptions CEL_OPTIONS =
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
// Enable macro call population for unparsing
.populateMacroCalls(true)
.build();

private static final CelCompiler CEL_COMPILER =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CEL_OPTIONS)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addLibraries(CelExtensions.comprehensions())
.addLibraries(CelExtensions.lists())
.addLibraries(CelExtensions.strings())
.addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
.build();
private static final CelRuntime CEL_RUNTIME =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addLibraries(CelOptionalLibrary.INSTANCE)
.addLibraries(CelExtensions.lists())
.addLibraries(CelExtensions.strings())
.addLibraries(CelExtensions.comprehensions())
.build();
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;

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()
.setOptions(CEL_OPTIONS)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addCompilerLibraries(CelExtensions.comprehensions())
.addCompilerLibraries(CelExtensions.lists())
.addCompilerLibraries(CelExtensions.strings())
.addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelExtensions.lists())
.addRuntimeLibraries(CelExtensions.strings())
.addRuntimeLibraries(CelExtensions.comprehensions())
.build();
}

private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

Object result = CEL_RUNTIME.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
assertThat(eval(expr)).isEqualTo(true);
}

@Test
public void comprehension_onTypeParam_success() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
Assume.assumeFalse(isParseOnly);
Cel customCel =
runtimeFlavor
.builder()
.setOptions(CEL_OPTIONS)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addLibraries(CelExtensions.comprehensions())
.addCompilerLibraries(CelExtensions.comprehensions())
.addVar("items", TypeParamType.create("T"))
.build();

CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
}
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
})
String expr)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
String unparsed = UNPARSER.unparse(ast);
assertThat(unparsed).isEqualTo(expr);
}
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
"{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
+ " err: 'no matching overload'}")
public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
Assume.assumeFalse(isParseOnly);
CelValidationException e =
assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

assertThat(e).hasMessageThat().contains(err);
}
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
+ " '2.0' already exists\"}")
public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
assertThat(e).hasCauseThat().hasMessageThat().contains(err);
// Planner does not allow decimals for map keys
Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
Throwable cause =
Throwables.getCausalChain(e).stream()
.filter(IllegalArgumentException.class::isInstance)
.filter(t -> t.getMessage() != null && t.getMessage().contains(err))
.findFirst()
.orElse(null);

assertWithMessage(
"Expected IllegalArgumentException with message containing '%s' in cause chain", err)
.that(cause)
.isNotNull();
}

@Test
public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
}

@Test
public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
}

private Object eval(String expression) throws Exception {
return eval(this.cel, expression, ImmutableMap.of());
}

private Object eval(Cel cel, String expression, Map<String, ?> variables) throws Exception {
CelAbstractSyntaxTree ast;
if (isParseOnly) {
ast = cel.parse(expression).getAst();
} else {
ast = cel.compile(expression).getAst();
}
return cel.createProgram(ast).eval(variables);
}
}
2 changes: 0 additions & 2 deletions extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
.build();
}



private Object eval(Cel cel, String expr) throws Exception {
return eval(cel, expr, ImmutableMap.of());
}
Expand Down
5 changes: 4 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
return false;
}
} else if (argVal instanceof ErrorValue) {
errorValue = (ErrorValue) argVal;
// Preserve the first encountered error instead of overwriting it with subsequent errors.
if (errorValue == null) {
errorValue = (ErrorValue) argVal;
}
} else if (argVal instanceof AccumulatedUnknowns) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
} else {
Expand Down
5 changes: 4 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
return true;
}
} else if (argVal instanceof ErrorValue) {
errorValue = (ErrorValue) argVal;
// Preserve the first encountered error instead of overwriting it with subsequent errors.
if (errorValue == null) {
errorValue = (ErrorValue) argVal;
}
} else if (argVal instanceof AccumulatedUnknowns) {
unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
} else {
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/test/resources/planner_unknownResultSet_errors.baseline
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
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 Comprehensions Extensions#1018

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 Comprehensions Extensions
#1018
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


150 changes: 79 additions & 71 deletions
extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,15 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOptions;
Expand All@@ -28,15 +32,15 @@
import dev.cel.common.exceptions.CelIndexOutOfBoundsException;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelMacro;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparser;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.runtime.CelEvaluationException;
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;

Expand All@@ -46,26 +50,35 @@ public class CelComprehensionsExtensionsTest {

 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableHeterogeneousNumericComparisons(true)
 // Enable macro call population for unparsing
 .populateMacroCalls(true)
 .build();

 private static final CelCompiler CEL_COMPILER =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .build();
 private static final CelRuntime CEL_RUNTIME =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addLibraries(CelOptionalLibrary.INSTANCE)
 .addLibraries(CelExtensions.lists())
 .addLibraries(CelExtensions.strings())
 .addLibraries(CelExtensions.comprehensions())
 .build();
 @TestParameter public CelRuntimeFlavor runtimeFlavor;
 @TestParameter public boolean isParseOnly;

 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()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.lists())
 .addCompilerLibraries(CelExtensions.strings())
 .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings())
 .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
 .addRuntimeLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.strings())
 .addRuntimeLibraries(CelExtensions.comprehensions())
 .build();
 }

 private static final CelUnparser UNPARSER = CelUnparserFactory.newUnparser();

Expand DownExpand Up@@ -101,11 +114,7 @@ public void allMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -127,11 +136,7 @@ public void existsMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -156,11 +161,7 @@ public void exists_oneMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -182,11 +183,7 @@ public void transformListMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -210,11 +207,7 @@ public void transformMapMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
Expand All@@ -238,24 +231,22 @@ public void transformMapEntryMacro_twoVarComprehension_success(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 Object result = CEL_RUNTIME.createProgram(ast).eval();

 assertThat(result).isEqualTo(true);
 assertThat(eval(expr)).isEqualTo(true);
 }

 @Test
 public void comprehension_onTypeParam_success() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 Assume.assumeFalse(isParseOnly);
 Cel customCel =
 runtimeFlavor
 .builder()
 .setOptions(CEL_OPTIONS)
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addLibraries(CelExtensions.comprehensions())
 .addCompilerLibraries(CelExtensions.comprehensions())
 .addVar("items", TypeParamType.create("T"))
 .build();

 CelAbstractSyntaxTree ast = celCompiler.compile("items.all(i, v, v > 0)").getAst();
 CelAbstractSyntaxTree ast = customCel.compile("items.all(i, v, v > 0)").getAst();

 assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
 }
Expand All@@ -275,7 +266,7 @@ public void unparseAST_twoVarComprehension(
 })
 String expr)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();
 CelAbstractSyntaxTree ast = isParseOnly ? cel.parse(expr).getAst() : cel.compile(expr).getAst();
 String unparsed = UNPARSER.unparse(ast);
 assertThat(unparsed).isEqualTo(expr);
 }
Expand DownExpand Up@@ -318,8 +309,9 @@ public void unparseAST_twoVarComprehension(
 "{expr: \"{'hello': 'world', 'greetings': 'tacocat'}.transformMapEntry(k, v, []) == {}\","
 + " err: 'no matching overload'}")
 public void twoVarComprehension_compilerErrors(String expr, String err) throws Exception {
 Assume.assumeFalse(isParseOnly);
 CelValidationException e =
 assertThrows(CelValidationException.class, () -> CEL_COMPILER.compile(expr).getAst());
 assertThrows(CelValidationException.class, () -> cel.compile(expr).getAst());

 assertThat(e).hasMessageThat().contains(err);
 }
Expand All@@ -339,34 +331,50 @@ public void twoVarComprehension_compilerErrors(String expr, String err) throws E
 + " '2.0' already exists\"}")
 public void twoVarComprehension_keyCollision_runtimeError(String expr, String err)
 throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile(expr).getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains(err);
 // Planner does not allow decimals for map keys
 Assume.assumeFalse(runtimeFlavor.equals(CelRuntimeFlavor.PLANNER) && expr.contains("2.0"));

 CelEvaluationException e = assertThrows(CelEvaluationException.class, () -> eval(expr));
 Throwable cause =
 Throwables.getCausalChain(e).stream()
 .filter(IllegalArgumentException.class::isInstance)
 .filter(t -> t.getMessage() != null && t.getMessage().contains(err))
 .findFirst()
 .orElse(null);

 assertWithMessage(
 "Expected IllegalArgumentException with message containing '%s' in cause chain", err)
 .that(cause)
 .isNotNull();
 }

 @Test
 public void twoVarComprehension_arithmeticException_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[0].all(i, k, i/k < k)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[0].all(i, k, i/k < k)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelDivideByZeroException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("/ by zero");
 }

 @Test
 public void twoVarComprehension_outOfBounds_runtimeError() throws Exception {
 CelAbstractSyntaxTree ast = CEL_COMPILER.compile("[1, 2].exists(i, v, [0][v] > 0)").getAst();

 CelEvaluationException e =
 assertThrows(CelEvaluationException.class, () -> CEL_RUNTIME.createProgram(ast).eval());

 assertThrows(CelEvaluationException.class, () -> eval("[1, 2].exists(i, v, [0][v] > 0)"));
 assertThat(e).hasCauseThat().isInstanceOf(CelIndexOutOfBoundsException.class);
 assertThat(e).hasCauseThat().hasMessageThat().contains("Index out of bounds: 1");
 }

 private Object eval(String expression) throws Exception {
 return eval(this.cel, expression, ImmutableMap.of());
 }

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

2 changes: 0 additions & 2 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,8 +334,6 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 .build();
 }



 private Object eval(Cel cel, String expr) throws Exception {
 return eval(cel, expr, ImmutableMap.of());
 }
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalAnd.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return false;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

5 changes: 4 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/planner/EvalOr.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,10 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) {
 return true;
 }
 } else if (argVal instanceof ErrorValue) {
 errorValue = (ErrorValue) argVal;
 // Preserve the first encountered error instead of overwriting it with subsequent errors.
 if (errorValue == null) {
 errorValue = (ErrorValue) argVal;
 }
 } else if (argVal instanceof AccumulatedUnknowns) {
 unknowns = AccumulatedUnknowns.maybeMerge(unknowns, argVal);
 } else {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/resources/planner_unknownResultSet_errors.baseline

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x.single_int32 == 1 || x.single_timestamp <= timestamp("bad timestamp string")
Expand DownExpand Up@@ -69,7 +69,7 @@ single_timestamp {
 seconds: 15
}
, unknown_attributes=[x.single_int32]}
error: evaluation error at test_location:89: Text 'another bad timestamp string' could not be parsed at index 0
error: evaluation error at test_location:31: Text 'bad timestamp string' could not be parsed at index 0
error_code: BAD_FORMAT

Source: x
Expand Down
Loading