From 9bac8b2572a8a84ed65d0eb63b2f54791a7906fb Mon Sep 17 00:00:00 2001 From: Sean Huh Date: Tue, 17 Nov 2026 10:27:08 -0800 Subject: [PATCH] Add new exists one macro to standard macro set PiperOrigin-RevId: 1023856507 --- .../cel/bundle/CelEnvironmentExporterTest.java | 5 +++-- .../java/dev/cel/parser/CelStandardMacro.java | 2 +- .../java/dev/cel/parser/CelParserImplTest.java | 15 +++++++-------- .../cel/parser/CelParserParameterizedTest.java | 3 --- .../java/dev/cel/parser/CelStandardMacroTest.java | 8 ++++++++ .../test/java/dev/cel/parser/PrattParserTest.java | 3 --- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java index f39f65e5b..a18d728bc 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java @@ -111,7 +111,7 @@ public void standardLibrarySubset_favorExclusion() throws Exception { FunctionSelector.create("matches", ImmutableSet.of()), FunctionSelector.create( "timestamp", ImmutableSet.of("string_to_timestamp")))) - .setExcludedMacros(ImmutableSet.of("map", "existsOne", "filter")) + .setExcludedMacros(ImmutableSet.of("map", "filter")) .build()); } @@ -164,7 +164,8 @@ public void standardLibrarySubset_favorInclusion() throws Exception { .contains(FunctionSelector.create("-_", ImmutableSet.of())); assertThat(actual.includedFunctions()) .contains(FunctionSelector.create("getDayOfYear", ImmutableSet.of())); - assertThat(actual.includedMacros()).containsAtLeast("all", "exists", "exists_one", "has"); + assertThat(actual.includedMacros()) + .containsAtLeast("all", "exists", "exists_one", "existsOne", "has"); } @Test diff --git a/parser/src/main/java/dev/cel/parser/CelStandardMacro.java b/parser/src/main/java/dev/cel/parser/CelStandardMacro.java index 823f71047..178546548 100644 --- a/parser/src/main/java/dev/cel/parser/CelStandardMacro.java +++ b/parser/src/main/java/dev/cel/parser/CelStandardMacro.java @@ -85,7 +85,7 @@ public enum CelStandardMacro { /** Set of all standard macros supported by the CEL spec. */ public static final ImmutableSet STANDARD_MACROS = - ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, MAP, MAP_FILTER, FILTER); + ImmutableSet.of(HAS, ALL, EXISTS, EXISTS_ONE, EXISTS_ONE_NEW, MAP, MAP_FILTER, FILTER); private final CelMacro macro; diff --git a/parser/src/test/java/dev/cel/parser/CelParserImplTest.java b/parser/src/test/java/dev/cel/parser/CelParserImplTest.java index 53417aa87..9ed9758ee 100644 --- a/parser/src/test/java/dev/cel/parser/CelParserImplTest.java +++ b/parser/src/test/java/dev/cel/parser/CelParserImplTest.java @@ -19,7 +19,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.testing.junit.testparameterinjector.TestParameter; import com.google.testing.junit.testparameterinjector.TestParameterInjector; import com.google.testing.junit.testparameterinjector.TestParameters; @@ -60,6 +59,8 @@ public void build_withMacros_containsAllMacros() { assertThat(parser.findMacro("exists:2:true")).hasValue(CelStandardMacro.EXISTS.getDefinition()); assertThat(parser.findMacro("exists_one:2:true")) .hasValue(CelStandardMacro.EXISTS_ONE.getDefinition()); + assertThat(parser.findMacro("existsOne:2:true")) + .hasValue(CelStandardMacro.EXISTS_ONE_NEW.getDefinition()); assertThat(parser.findMacro("map:2:true")).hasValue(CelStandardMacro.MAP.getDefinition()); assertThat(parser.findMacro("map:3:true")) .hasValue(CelStandardMacro.MAP_FILTER.getDefinition()); @@ -77,6 +78,8 @@ public void build_withStandardMacros_containsAllMacros() { assertThat(parser.findMacro("exists:2:true")).hasValue(CelStandardMacro.EXISTS.getDefinition()); assertThat(parser.findMacro("exists_one:2:true")) .hasValue(CelStandardMacro.EXISTS_ONE.getDefinition()); + assertThat(parser.findMacro("existsOne:2:true")) + .hasValue(CelStandardMacro.EXISTS_ONE_NEW.getDefinition()); assertThat(parser.findMacro("map:2:true")).hasValue(CelStandardMacro.MAP.getDefinition()); assertThat(parser.findMacro("map:3:true")) .hasValue(CelStandardMacro.MAP_FILTER.getDefinition()); @@ -100,6 +103,8 @@ public void build_withStandardMacrosAndCustomMacros_containsAllMacros() { assertThat(parser.findMacro("exists:2:true")).hasValue(CelStandardMacro.EXISTS.getDefinition()); assertThat(parser.findMacro("exists_one:2:true")) .hasValue(CelStandardMacro.EXISTS_ONE.getDefinition()); + assertThat(parser.findMacro("existsOne:2:true")) + .hasValue(CelStandardMacro.EXISTS_ONE_NEW.getDefinition()); assertThat(parser.findMacro("map:2:true")).hasValue(CelStandardMacro.MAP.getDefinition()); assertThat(parser.findMacro("map:3:true")) .hasValue(CelStandardMacro.MAP_FILTER.getDefinition()); @@ -432,13 +437,7 @@ public void parse_macroExpansionNodeLimitNotExceeded_success() throws CelValidat @TestParameters("{expression: 'A.filter(a?b, c)'}") public void parse_macroArgumentContainsSyntaxError_throws(String expression) { CelParser parser = - newParserBuilder() - .setStandardMacros( - ImmutableSet.builder() - .addAll(CelStandardMacro.STANDARD_MACROS) - .add(CelStandardMacro.EXISTS_ONE_NEW) - .build()) - .build(); + newParserBuilder().setStandardMacros(CelStandardMacro.STANDARD_MACROS).build(); CelValidationResult parseResult = parser.parse(expression); diff --git a/parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java b/parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java index 9189c7404..5f20907f3 100644 --- a/parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java +++ b/parser/src/test/java/dev/cel/parser/CelParserParameterizedTest.java @@ -79,9 +79,6 @@ public final class CelParserParameterizedTest extends BaselineTestCase { CelStandardMacro.STANDARD_MACROS.stream() .map(CelStandardMacro::getDefinition) .collect(toImmutableMap(CelMacro::getKey, Function.identity()))) - .put( - CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getKey(), - CelStandardMacro.EXISTS_ONE_NEW.getDefinition()) .put( "noop_macro", CelMacro.newGlobalVarArgMacro("noop_macro", (a, b, c) -> Optional.empty())) diff --git a/parser/src/test/java/dev/cel/parser/CelStandardMacroTest.java b/parser/src/test/java/dev/cel/parser/CelStandardMacroTest.java index 7ab96180c..c95289a32 100644 --- a/parser/src/test/java/dev/cel/parser/CelStandardMacroTest.java +++ b/parser/src/test/java/dev/cel/parser/CelStandardMacroTest.java @@ -18,6 +18,7 @@ import com.google.common.testing.EqualsTester; import dev.cel.common.Operator; +import java.util.EnumSet; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -153,9 +154,16 @@ public void testEquals() { .addEqualityGroup(CelStandardMacro.ALL) .addEqualityGroup(CelStandardMacro.EXISTS) .addEqualityGroup(CelStandardMacro.EXISTS_ONE) + .addEqualityGroup(CelStandardMacro.EXISTS_ONE_NEW) .addEqualityGroup(CelStandardMacro.MAP) .addEqualityGroup(CelStandardMacro.MAP_FILTER) .addEqualityGroup(CelStandardMacro.FILTER) .testEquals(); } + + @Test + public void standardMacros_containsAllStandardMacros() { + assertThat(CelStandardMacro.STANDARD_MACROS) + .containsExactlyElementsIn(EnumSet.allOf(CelStandardMacro.class)); + } } diff --git a/parser/src/test/java/dev/cel/parser/PrattParserTest.java b/parser/src/test/java/dev/cel/parser/PrattParserTest.java index ff7233c12..501fc2f75 100644 --- a/parser/src/test/java/dev/cel/parser/PrattParserTest.java +++ b/parser/src/test/java/dev/cel/parser/PrattParserTest.java @@ -72,9 +72,6 @@ public final class PrattParserTest extends BaselineTestCase { CelStandardMacro.STANDARD_MACROS.stream() .map(CelStandardMacro::getDefinition) .collect(toImmutableMap(CelMacro::getKey, Function.identity()))) - .put( - CelStandardMacro.EXISTS_ONE_NEW.getDefinition().getKey(), - CelStandardMacro.EXISTS_ONE_NEW.getDefinition()) .put( "noop_macro", CelMacro.newGlobalVarArgMacro("noop_macro", (a, b, c) -> Optional.empty()))