diff --git a/PLANNER_MIGRATION_GUIDE.md b/PLANNER_MIGRATION_GUIDE.md index 397a36649..b0f5ba7aa 100644 --- a/PLANNER_MIGRATION_GUIDE.md +++ b/PLANNER_MIGRATION_GUIDE.md @@ -50,6 +50,7 @@ CelOptions options = CelOptions.current() // .enableUnsignedLongs(...) // .unwrapWellKnownTypesOnFunctionDispatch(...) // .enableTimestampEpoch(...) + // .enableHeterogeneousNumericComparisons(...) .build(); CelRuntime runtime = CelRuntimeFactory.plannerRuntimeBuilder() diff --git a/bundle/src/main/java/dev/cel/bundle/CelEnvironment.java b/bundle/src/main/java/dev/cel/bundle/CelEnvironment.java index 5fe2ff300..7ef2edad4 100644 --- a/bundle/src/main/java/dev/cel/bundle/CelEnvironment.java +++ b/bundle/src/main/java/dev/cel/bundle/CelEnvironment.java @@ -103,7 +103,12 @@ public abstract class CelEnvironment { "cel.feature.backtick_escape_syntax", CelOptions.Builder::enableQuotedIdentifierSyntax, "cel.feature.cross_type_numeric_comparisons", - CelOptions.Builder::enableHeterogeneousNumericComparisons); + // Always enabled (mirroring cel-go); the name is still accepted for existing configs. + (unused, enabled) -> + checkArgument( + enabled, + "cel.feature.cross_type_numeric_comparisons cannot be disabled. Subset the" + + " standard library instead.")); /** Environment source in textual format (ex: textproto, YAML). */ public abstract Optional source(); diff --git a/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java b/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java index 9c0fc3a7b..a9ae804d5 100644 --- a/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java +++ b/bundle/src/main/java/dev/cel/bundle/CelEnvironmentExporter.java @@ -208,10 +208,6 @@ public CelEnvironment export(CelCompiler cel) { private void addOptions(CelEnvironment.Builder envBuilder, CelOptions options) { // The set of features supported in the exported environment in Go is pretty limited right now. ImmutableSet.Builder featureFlags = ImmutableSet.builder(); - if (options.enableHeterogeneousNumericComparisons()) { - featureFlags.add( - CelEnvironment.FeatureFlag.create("cel.feature.cross_type_numeric_comparisons", true)); - } if (options.enableQuotedIdentifierSyntax()) { featureFlags.add( CelEnvironment.FeatureFlag.create("cel.feature.backtick_escape_syntax", true)); diff --git a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java index 461453587..f39f65e5b 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentExporterTest.java @@ -50,8 +50,7 @@ @RunWith(TestParameterInjector.class) public class CelEnvironmentExporterTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; @Test public void extensions_latest() { @@ -350,7 +349,6 @@ public void options() { .maxParseRecursionDepth(10) .maxParseExpressionNodeCount(500) .enableQuotedIdentifierSyntax(true) - .enableHeterogeneousNumericComparisons(true) .populateMacroCalls(true) .build()) .build(); @@ -360,7 +358,6 @@ public void options() { assertThat(celEnvironment.features()) .containsExactly( CelEnvironment.FeatureFlag.create("cel.feature.backtick_escape_syntax", true), - CelEnvironment.FeatureFlag.create("cel.feature.cross_type_numeric_comparisons", true), CelEnvironment.FeatureFlag.create("cel.feature.macro_call_tracking", true)); assertThat(celEnvironment.limits()) .containsExactly( diff --git a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentTest.java b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentTest.java index 9b85a2018..337fbbabb 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentTest.java @@ -49,8 +49,7 @@ @RunWith(TestParameterInjector.class) public class CelEnvironmentTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; @Test public void newBuilder_defaults() { @@ -138,6 +137,21 @@ public void extend_allFeatureFlags() throws Exception { assertThat(result).isTrue(); } + @Test + public void extend_crossTypeNumericComparisonsDisabled_throws() { + CelEnvironment environment = + CelEnvironment.newBuilder() + .setFeatures( + CelEnvironment.FeatureFlag.create( + "cel.feature.cross_type_numeric_comparisons", false)) + .build(); + Cel cel = CelFactory.plannerCelBuilder().build(); + + IllegalArgumentException e = + assertThrows(IllegalArgumentException.class, () -> environment.extend(cel, CEL_OPTIONS)); + assertThat(e).hasMessageThat().contains("cannot be disabled"); + } + @Test public void extend_allLimits() throws Exception { CelEnvironment environment = diff --git a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentYamlParserTest.java b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentYamlParserTest.java index aea2d9011..6c427e335 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelEnvironmentYamlParserTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelEnvironmentYamlParserTest.java @@ -54,8 +54,7 @@ @RunWith(TestParameterInjector.class) public final class CelEnvironmentYamlParserTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; private static final Cel CEL_WITH_MESSAGE_TYPES = CelFactory.plannerCelBuilder() diff --git a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java index 21dec65cd..f5ac998bc 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java @@ -499,7 +499,6 @@ public void compile_withOptionalTypes() throws Exception { CelFactory.plannerCelBuilder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableOptionalSyntax(true) .build()) .addVar("a", OptionalType.create(SimpleType.STRING)) @@ -834,7 +833,6 @@ public void program_deepTypeResolution() throws Exception { .addFileTypes(CheckedExpr.getDescriptor().getFile()) // In this test 'ParsedExpr' is defined in syntax.proto, while the descriptor provided // is defined in checked.proto, which imports syntax.proto. - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setContainer(CelContainer.ofName(packageName)) .setResultType(StructTypeReference.create(packageName + ".ParsedExpr")) .build(); @@ -857,7 +855,6 @@ public void program_deepTypeResolutionForRuntime_success() throws Exception { CelRuntime celRuntime = CelRuntimeFactory.plannerRuntimeBuilder() .addFileTypes(CheckedExpr.getDescriptor().getFile()) - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) // CEL-Internal-2 .build(); CelRuntime.Program program = celRuntime.createProgram(ast); @@ -912,7 +909,6 @@ public void program_enumTypeDirectResolution() throws Exception { Cel cel = plannerCelBuilderWithMacros() .addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile()) - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setContainer( CelContainer.ofName("dev.cel.testing.testdata.proto3.StandaloneGlobalEnum")) .setResultType(SimpleType.BOOL) @@ -929,7 +925,6 @@ public void program_enumTypeDirectResolution() throws Exception { public void program_enumTypeReferenceResolution() throws Exception { Cel cel = plannerCelBuilderWithMacros() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addMessageTypes(Struct.getDescriptor()) .setResultType(StructTypeReference.create("google.protobuf.NullValue")) .setContainer(CelContainer.ofName("google.protobuf")) @@ -945,7 +940,6 @@ public void program_enumTypeReferenceResolution() throws Exception { public void program_enumTypeTransitiveResolution() throws Exception { Cel cel = plannerCelBuilderWithMacros() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addMessageTypes(Proto2ExtensionScopedMessage.getDescriptor()) .setResultType(StructTypeReference.create("google.protobuf.NullValue")) .setContainer(CelContainer.ofName("google.protobuf")) @@ -1079,7 +1073,6 @@ public void setOptions() throws Exception { plannerCelBuilderWithMacros() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .retainRepeatedUnaryOperators(true) .build()) .build(); @@ -1850,7 +1843,6 @@ public void program_comprehensionDisabled_throws() throws Exception { plannerCelBuilderWithMacros() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableComprehension(false) .build()) .build(); @@ -1868,7 +1860,6 @@ public void program_regexProgramSizeUnderLimit_success() throws Exception { plannerCelBuilderWithMacros() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .maxRegexProgramSize(7) .build()) .build(); @@ -1885,7 +1876,6 @@ public void program_regexProgramSizeExceedsLimit_throws() throws Exception { plannerCelBuilderWithMacros() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .maxRegexProgramSize(6) .build()) .build(); @@ -2103,7 +2093,6 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti .addMessageTypes(SingleFile.getDescriptor()) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableJsonFieldNames(true) .build()) .build(); @@ -2112,7 +2101,6 @@ public void eval_withJsonFieldName_runtimeOptionDisabled_throws() throws Excepti .addMessageTypes(SingleFile.getDescriptor()) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableJsonFieldNames(false) .build()) .build(); @@ -2134,7 +2122,6 @@ public void compile_withJsonFieldName_astTagged() throws Exception { .addMessageTypes(SingleFile.getDescriptor()) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableJsonFieldNames(true) .build()) .build(); @@ -2154,7 +2141,6 @@ public void compile_withJsonFieldName_protoFieldNameComparison_throws() throws E .addMessageTypes(SingleFile.getDescriptor()) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableJsonFieldNames(true) .build()) .build(); @@ -2213,7 +2199,6 @@ private static Cel setupEnv(CelBuilder celBuilder) { .setOptions( CelOptions.current() .enableJsonFieldNames(true) - .enableHeterogeneousNumericComparisons(true) .enableQuotedIdentifierSyntax(true) .build()) .build(); diff --git a/common/src/main/java/dev/cel/common/CelOptions.java b/common/src/main/java/dev/cel/common/CelOptions.java index 5131a9dd0..632715fe5 100644 --- a/common/src/main/java/dev/cel/common/CelOptions.java +++ b/common/src/main/java/dev/cel/common/CelOptions.java @@ -307,8 +307,7 @@ public abstract static class Builder { * Enable the {@code int64_to_timestamp} overload which creates a timestamp from Unix epoch * seconds. * - *

Historically used to opt-in to this feature, this option is now enabled by default across - * all runtimes. + *

This option is enabled by default in {@link CelOptions#current}. * *

TODO: Remove this feature once it has been auto-enabled. * @@ -327,7 +326,13 @@ public abstract static class Builder { *

This option is enabled by default in {@link CelOptions#current}. * *

TODO: Remove this feature once it has been auto-enabled. + * + * @deprecated This option is now enabled by default. If you are passing {@code true}, simply + * remove this method call. If you are passing {@code false} to disable this feature, subset + * the environment instead using {@code dev.cel.checker.CelStandardDeclarations} and {@code + * dev.cel.runtime.CelStandardFunctions}. */ + @Deprecated public abstract Builder enableHeterogeneousNumericComparisons(boolean value); /** diff --git a/common/src/test/java/dev/cel/common/values/StructValueTest.java b/common/src/test/java/dev/cel/common/values/StructValueTest.java index 978222869..92c6b70b4 100644 --- a/common/src/test/java/dev/cel/common/values/StructValueTest.java +++ b/common/src/test/java/dev/cel/common/values/StructValueTest.java @@ -132,7 +132,6 @@ public void celTypeTest() { public void evaluate_typeOfCustomStruct() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addVar("a", CUSTOM_STRUCT_TYPE) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider(CUSTOM_STRUCT_VALUE_PROVIDER) @@ -148,7 +147,6 @@ public void evaluate_typeOfCustomStruct() throws Exception { public void evaluate_usingCustomClass_createNewStruct() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider(CUSTOM_STRUCT_VALUE_PROVIDER) .build(); @@ -163,7 +161,6 @@ public void evaluate_usingCustomClass_createNewStruct() throws Exception { public void evaluate_usingCustomClass_asVariable() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addVar("a", CUSTOM_STRUCT_TYPE) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider(CUSTOM_STRUCT_VALUE_PROVIDER) @@ -181,7 +178,6 @@ public void evaluate_usingCustomClass_asVariable() throws Exception { public void evaluate_usingCustomClass_asVariableSelectField() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addVar("a", CUSTOM_STRUCT_TYPE) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider(CUSTOM_STRUCT_VALUE_PROVIDER) @@ -196,7 +192,6 @@ public void evaluate_usingCustomClass_asVariableSelectField() throws Exception { public void evaluate_usingCustomClass_selectField() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider(CUSTOM_STRUCT_VALUE_PROVIDER) .build(); @@ -211,7 +206,6 @@ public void evaluate_usingCustomClass_selectField() throws Exception { public void evaluate_usingMultipleProviders_selectFieldFromCustomClass() throws Exception { Cel cel = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setTypeProvider(CUSTOM_STRUCT_TYPE_PROVIDER) .setValueProvider( CombinedCelValueProvider.combine( diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java index 42c40bd48..0ff0d63a7 100644 --- a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java +++ b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java @@ -92,7 +92,6 @@ public final class ConformanceTest extends Statement { private static final CelOptions OPTIONS = CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableProtoDifferencerEquality(true) .enableOptionalSyntax(true) .enableQuotedIdentifierSyntax(true) diff --git a/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java index 00fcad473..6b9ffa0d2 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java @@ -48,7 +48,6 @@ public final class CelBindingsExtensionsTest extends CelExtensionTestBase { protected Cel newCelEnv() { return runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setStandardMacros(CelStandardMacro.STANDARD_MACROS) .addCompilerLibraries(CelOptionalLibrary.INSTANCE, CelExtensions.bindings()) .addRuntimeLibraries(CelOptionalLibrary.INSTANCE) @@ -102,7 +101,6 @@ public void binding_nonCelNamespace_success(String expr) throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addCompilerLibraries(CelExtensions.bindings()) .addFunctionDeclarations( CelFunctionDecl.newFunctionDeclaration( @@ -144,7 +142,6 @@ public void lazyBinding_bindingVarNeverReferenced() throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setStandardMacros(CelStandardMacro.HAS) .addMessageTypes(TestAllTypes.getDescriptor()) .addVar("msg", StructTypeReference.create(TestAllTypes.getDescriptor().getFullName())) @@ -191,7 +188,6 @@ public void lazyBinding_accuInitEvaluatedOnce() throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addCompilerLibraries(CelExtensions.bindings()) .addFunctionDeclarations( CelFunctionDecl.newFunctionDeclaration( @@ -221,7 +217,6 @@ public void lazyBinding_withNestedBinds() throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .addCompilerLibraries(CelExtensions.bindings()) .addFunctionDeclarations( CelFunctionDecl.newFunctionDeclaration( @@ -255,7 +250,6 @@ public void lazyBinding_boundAttributeInComprehension() throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setStandardMacros(CelStandardMacro.MAP) .addCompilerLibraries(CelExtensions.bindings()) .addFunctionDeclarations( @@ -288,7 +282,6 @@ public void lazyBinding_boundAttributeInNestedComprehension() throws Exception { Cel customCel = runtimeFlavor .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setStandardMacros(CelStandardMacro.EXISTS) .addCompilerLibraries(CelExtensions.bindings()) .addFunctionDeclarations( diff --git a/extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java index b263e7603..4c8bf1584 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelComprehensionsExtensionsTest.java @@ -64,7 +64,6 @@ public class CelComprehensionsExtensionsTest extends CelExtensionTestBase { private static final CelOptions CEL_OPTIONS = CelOptions.current() - .enableHeterogeneousNumericComparisons(true) // Enable macro call population for unparsing .populateMacroCalls(true) .build(); diff --git a/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java index d98fc0700..2d26815ae 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java @@ -43,8 +43,7 @@ @RunWith(TestParameterInjector.class) public class CelEncoderExtensionsTest extends CelExtensionTestBase { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; @Override protected Cel newCelEnv() { @@ -275,7 +274,8 @@ public void encoders_deprecatedNoArg() throws Exception { } @Test - @SuppressWarnings("deprecation") // Test only - verifying deprecated evaluateCanonicalTypesToNativeValues option + @SuppressWarnings( + "deprecation") // Test only - verifying deprecated evaluateCanonicalTypesToNativeValues option public void encoders_evaluateCanonicalTypesToNativeValuesDisabled_producesAndConsumesByteString() throws Exception { CelOptions options = CelOptions.current().evaluateCanonicalTypesToNativeValues(false).build(); diff --git a/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java index 8e277c0a8..cef4e46a3 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java @@ -26,7 +26,6 @@ import dev.cel.bundle.Cel; import dev.cel.common.CelAbstractSyntaxTree; import dev.cel.common.CelFunctionDecl; -import dev.cel.common.CelOptions; import dev.cel.common.CelOverloadDecl; import dev.cel.common.CelValidationException; import dev.cel.common.types.ListType; @@ -60,11 +59,6 @@ public void setUp() { this.cel = runtimeFlavor .builder() - .setOptions( - CelOptions.current() - .enableHeterogeneousNumericComparisons( - runtimeFlavor.equals(CelRuntimeFlavor.PLANNER)) - .build()) .addCompilerLibraries(CelExtensions.math()) .addRuntimeLibraries(CelExtensions.math()) .build(); diff --git a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java index 68fb42b5e..a08d861f2 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java @@ -146,7 +146,7 @@ private TestCelBuilder newCelBuilder() { // Intentionally testing the deprecated legacy runtime in the test matrix. @SuppressWarnings("deprecation") private TestCelBuilder newCelBuilder(int version) { - CelOptions options = CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + CelOptions options = CelOptions.DEFAULT; CelContainer container = CelContainer.ofName("cel.expr.conformance.proto3"); if (testMode.isLite()) { CelCompilerBuilder compilerBuilder = diff --git a/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java index 800722cc0..674924809 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java @@ -55,8 +55,7 @@ @RunWith(TestParameterInjector.class) public final class CelSetsExtensionsTest extends CelExtensionTestBase { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; @Override protected Cel newCelEnv() { diff --git a/optimizer/src/test/java/dev/cel/optimizer/AstMutatorTest.java b/optimizer/src/test/java/dev/cel/optimizer/AstMutatorTest.java index 704a0c88f..bb0d1076b 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/AstMutatorTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/AstMutatorTest.java @@ -64,7 +64,6 @@ public class AstMutatorTest { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addMessageTypes(TestAllTypes.getDescriptor()) .addCompilerLibraries( @@ -872,7 +871,6 @@ public void mangleComprehensionVariable_macroSourceDisabled_macroCallMapIsEmpty( .setOptions( CelOptions.current() .populateMacroCalls(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("[false].exists(i, i)").getAst(); diff --git a/optimizer/src/test/java/dev/cel/optimizer/CelOptimizerImplTest.java b/optimizer/src/test/java/dev/cel/optimizer/CelOptimizerImplTest.java index 6743bf0f7..a56f30fd3 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/CelOptimizerImplTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/CelOptimizerImplTest.java @@ -43,7 +43,6 @@ public class CelOptimizerImplTest { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .setStandardMacros(CelStandardMacro.STANDARD_MACROS) .build(); diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java index 3c6bcf6d3..239dae030 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java @@ -59,7 +59,6 @@ public class ConstantFoldingOptimizerTest { private static final CelOptions CEL_OPTIONS = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); private static final CelUnparser CEL_UNPARSER = CelUnparserFactory.newUnparser(); @@ -529,7 +528,6 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E .setStandardMacros(CelStandardMacro.STANDARD_MACROS) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .populateMacroCalls(false) .build()) .addCompilerLibraries(CelExtensions.bindings(), CelOptionalLibrary.INSTANCE) @@ -921,11 +919,7 @@ public void constantFold_astProducesConsistentlyNumberedIds() throws Exception { @Test public void iterationLimitReached_throws() throws Exception { - Cel cel = - runtimeFlavor - .builder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) - .build(); + Cel cel = runtimeFlavor.builder().build(); CelAbstractSyntaxTree ast = cel.compile("1 + 1").getAst(); CelOptimizer optimizer = CelOptimizerFactory.standardCelOptimizerBuilder(cel) diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java index 8712cbebc..24deb6f5b 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java @@ -61,7 +61,6 @@ public class InliningOptimizerTest { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java index b013dd16b..28f5bc729 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java @@ -90,7 +90,6 @@ public final class SelectOptimizerTest { private static final CelOptions CEL_OPTIONS = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); private static final CelUnparser CEL_UNPARSER = CelUnparserFactory.newUnparser(); diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java index 6e256c2f4..ec35ff9cf 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java @@ -62,7 +62,6 @@ private static Cel setupCelEnv(CelBuilder celBuilder) { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addCompilerLibraries( CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions()) diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java index a50a0823b..4736369ef 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java @@ -77,7 +77,6 @@ private static Cel setupCelEnv(CelBuilder celBuilder) { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addCompilerLibraries( CelExtensions.bindings(), CelExtensions.strings(), CelExtensions.optional()) @@ -841,7 +840,6 @@ public void cse_nestedMacro_noOp_assertAstIdCorrectness() throws Exception { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addCompilerLibraries(CelExtensions.comprehensions()) .addRuntimeLibraries(CelExtensions.comprehensions()) @@ -870,7 +868,6 @@ public void cse_nestedMacro_withOptimization_assertAstIdCorrectness() throws Exc .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addCompilerLibraries(CelExtensions.comprehensions()) .addRuntimeLibraries(CelExtensions.comprehensions()) diff --git a/policy/src/main/java/dev/cel/policy/tools/CelPolicyCompilerTool.java b/policy/src/main/java/dev/cel/policy/tools/CelPolicyCompilerTool.java index 0e5a97007..dcdf4fa6c 100644 --- a/policy/src/main/java/dev/cel/policy/tools/CelPolicyCompilerTool.java +++ b/policy/src/main/java/dev/cel/policy/tools/CelPolicyCompilerTool.java @@ -144,7 +144,6 @@ public final class CelPolicyCompilerTool implements Callable { private static final CelOptions CEL_OPTIONS = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); private PrintWriter out() { diff --git a/policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java b/policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java index db1a36dcf..93ce81e57 100644 --- a/policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java +++ b/policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java @@ -71,7 +71,6 @@ public final class CelPolicyCompilerImplTest { private static final CelOptions CEL_OPTIONS = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); @TestParameter private CelRuntimeFlavor runtimeFlavor; diff --git a/runtime/src/test/java/dev/cel/runtime/AbstractPlannerInterpreterTest.java b/runtime/src/test/java/dev/cel/runtime/AbstractPlannerInterpreterTest.java index 5d8474442..a976da791 100644 --- a/runtime/src/test/java/dev/cel/runtime/AbstractPlannerInterpreterTest.java +++ b/runtime/src/test/java/dev/cel/runtime/AbstractPlannerInterpreterTest.java @@ -148,7 +148,6 @@ public void planner_unknownResultSet_success() { celRuntime = newBaseRuntimeBuilder( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableOptionalSyntax(true) .comprehensionMaxIterations(1_000) .build()) diff --git a/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeVersionSkewTest.java b/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeVersionSkewTest.java index 93c924b0a..3107a23e2 100644 --- a/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeVersionSkewTest.java +++ b/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeVersionSkewTest.java @@ -119,7 +119,6 @@ public final class CelLiteRuntimeVersionSkewTest { private static final CelOptions CEL_OPTIONS = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); private static final ImmutableSet SERVER_ONLY_FIELD_NAMES = diff --git a/runtime/src/test/java/dev/cel/runtime/CelRuntimeTest.java b/runtime/src/test/java/dev/cel/runtime/CelRuntimeTest.java index 6c209c150..1207c8c2b 100644 --- a/runtime/src/test/java/dev/cel/runtime/CelRuntimeTest.java +++ b/runtime/src/test/java/dev/cel/runtime/CelRuntimeTest.java @@ -73,7 +73,6 @@ public void evaluate_anyPackedEqualityUsingProtoDifferencer_success() throws Exc .builder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableProtoDifferencerEquality(true) .build()) .addVar("a", StructTypeReference.create(AttributeContext.getDescriptor().getFullName())) @@ -153,7 +152,6 @@ public void advanceEvaluation_withUnknownTracking_noSelfReferenceInMerge(String .addVar("my_list", ListType.create(SimpleType.INT)) .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableUnknownTracking(true) .build()) .build(); @@ -184,7 +182,6 @@ public void advanceEvaluation_withUnknownContext_tracksUnknowns() throws Excepti .builder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableUnknownTracking(true) .build()) .setContainer(CelContainer.ofName("com.google")) @@ -211,7 +208,6 @@ public void advanceEvaluation_withResolvedUnknownContext_evaluatesResult() throw .builder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableUnknownTracking(true) .build()) .setContainer(CelContainer.ofName("com.google")) @@ -495,7 +491,6 @@ public void trace_shortCircuitingDisabled_logicalAndAllBranchesVisited( .setOptions( CelOptions.current() .enableShortCircuiting(true) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); Cel cel = @@ -504,7 +499,6 @@ public void trace_shortCircuitingDisabled_logicalAndAllBranchesVisited( .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(expression).getAst(); @@ -545,7 +539,6 @@ public void trace_shortCircuitingDisabledWithUnknownsAndedToFalse_returnsFalse(S .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(source).getAst(); @@ -578,7 +571,6 @@ public void trace_shortCircuitingDisabledWithUnknownAndedToTrue_returnsUnknown(S .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(source).getAst(); @@ -608,7 +600,6 @@ public void trace_shortCircuitingDisabled_logicalOrAllBranchesVisited( .setOptions( CelOptions.current() .enableShortCircuiting(true) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); Cel cel = @@ -617,7 +608,6 @@ public void trace_shortCircuitingDisabled_logicalOrAllBranchesVisited( .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(expression).getAst(); @@ -654,7 +644,6 @@ public void trace_shortCircuitingDisabledWithUnknownsOredToFalse_returnsUnknown( .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(source).getAst(); @@ -691,7 +680,6 @@ public void trace_shortCircuitingDisabledWithUnknownOredToTrue_returnsTrue(Strin .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(source).getAst(); @@ -718,7 +706,6 @@ public void trace_shortCircuitingDisabled_ternaryAllBranchesVisited() throws Exc .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("true ? false : true").getAst(); @@ -749,7 +736,6 @@ public void trace_shortCircuitingDisabled_ternaryWithUnknowns(String source) thr .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(source).getAst(); @@ -785,7 +771,6 @@ public void trace_shortCircuitingDisabled_ternaryWithError( .setOptions( CelOptions.current() .enableShortCircuiting(true) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); Cel cel = @@ -794,7 +779,6 @@ public void trace_shortCircuitingDisabled_ternaryWithError( .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile(expression).getAst(); @@ -818,7 +802,6 @@ public void trace_shortCircuitingDisabled_ternaryWithSelectedError() throws Exce .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("true ? (1 / 0) : 2").getAst(); @@ -849,7 +832,6 @@ public void trace_shortCircuitingDisabled_ternaryWithCustomError() throws Except .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("true ? error_func() : false").getAst(); @@ -889,7 +871,6 @@ public void trace_shortCircuitingDisabled_logicalAndPrefersFirstError() throws E .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("error_1() && error_2()").getAst(); @@ -929,7 +910,6 @@ public void trace_shortCircuitingDisabled_logicalOrPrefersFirstError() throws Ex .setOptions( CelOptions.current() .enableShortCircuiting(false) - .enableHeterogeneousNumericComparisons(true) .build()) .build(); CelAbstractSyntaxTree ast = cel.compile("error_1() || error_2()").getAst(); diff --git a/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java b/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java index 098555b90..43b878b71 100644 --- a/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java +++ b/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java @@ -188,10 +188,7 @@ public void standardEnvironment_subsetEnvironment() throws Exception { @TestParameters("{expression: '2u <= 1.0'}") @TestParameters("{expression: '1.0 <= 2u'}") public void heterogeneousEqualityDisabled_mixedTypeComparisons_throws(String expression) { - CelCompiler celCompiler = - CelCompilerFactory.standardCelCompilerBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) - .build(); + CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build(); CelRuntime celRuntime = CelRuntimeFactory.legacyCelRuntimeBuilder() .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(false).build()) diff --git a/runtime/src/test/java/dev/cel/runtime/planner/OptimizedSelectPlannerTest.java b/runtime/src/test/java/dev/cel/runtime/planner/OptimizedSelectPlannerTest.java index bc655461a..b41ee0ffc 100644 --- a/runtime/src/test/java/dev/cel/runtime/planner/OptimizedSelectPlannerTest.java +++ b/runtime/src/test/java/dev/cel/runtime/planner/OptimizedSelectPlannerTest.java @@ -88,8 +88,7 @@ @RunWith(TestParameterInjector.class) public final class OptimizedSelectPlannerTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; private static final RuntimeEquality RUNTIME_EQUALITY = RuntimeEquality.create(RuntimeHelpers.create(), CEL_OPTIONS); private static final CelTypeProvider TYPE_PROVIDER = diff --git a/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerAsyncTest.java b/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerAsyncTest.java index 074d4a149..e9f0279f0 100644 --- a/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerAsyncTest.java +++ b/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerAsyncTest.java @@ -454,7 +454,6 @@ public void evalAsync_exhaustiveEval_onlyAwaitsNecessaryBranches( plannerRuntimeBuilder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()) .addFunctionBindings( @@ -501,7 +500,6 @@ public void evalAsync_exhaustiveLogicalOpsWithNonStrictErrors_evaluatesSuccessfu plannerRuntimeBuilder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()) .build() @@ -552,7 +550,6 @@ public void evalAsync_shortCircuitedUnknownWithAsyncCall_doesNotLeakAsyncCall() plannerRuntimeBuilder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()) .addFunctionBindings( @@ -1203,7 +1200,6 @@ public void evalAsync_protoDifferencerEquality_deduplicatesEquivalentProtoArgs() plannerRuntimeBuilder() .setOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableProtoDifferencerEquality(true) .build()) .addMessageTypes(TestAllTypes.getDescriptor()) diff --git a/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java b/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java index 2cb50e4ce..dd225229b 100644 --- a/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java +++ b/runtime/src/test/java/dev/cel/runtime/planner/ProgramPlannerTest.java @@ -102,8 +102,7 @@ @RunWith(TestParameterInjector.class) public final class ProgramPlannerTest { // Note that the following deps will be built from top-level builder APIs - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; private static final CelTypeProvider TYPE_PROVIDER = new CombinedCelTypeProvider( DefaultTypeProvider.getInstance(), @@ -2246,7 +2245,6 @@ public void plan_exhaustiveLogicalOr_shortCircuitDominatesError( ProgramPlanner planner = newPlannerWithOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()); Program program = planner.plan(ast); @@ -2264,7 +2262,6 @@ public void plan_exhaustiveLogicalAnd_shortCircuitDominatesError( ProgramPlanner planner = newPlannerWithOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()); Program program = planner.plan(ast); @@ -2393,7 +2390,6 @@ public void plan_exhaustiveConditional_untakenBranchError_evaluatesSuccessfully( ProgramPlanner planner = newPlannerWithOptions( CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableShortCircuiting(false) .build()); Program program = planner.plan(ast); diff --git a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java index 13a3e3e62..9a2534cc2 100644 --- a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java +++ b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java @@ -115,7 +115,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase { private static final CelOptions BASE_CEL_OPTIONS = CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableOptionalSyntax(true) .comprehensionMaxIterations(1_000) .build(); diff --git a/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java b/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java index e62c24ada..b730c1e77 100644 --- a/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java +++ b/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java @@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase { protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000; protected static final CelOptions TEST_OPTIONS = CelOptions.current() - .enableHeterogeneousNumericComparisons(true) .enableOptionalSyntax(true) .comprehensionMaxIterations(1_000) .build(); diff --git a/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java b/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java index 86e775178..3dc8401e6 100644 --- a/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java +++ b/testing/src/main/java/dev/cel/testing/testrunner/CelTestContext.java @@ -166,7 +166,7 @@ public Optional typeRegistry() { public static CelTestContext.Builder newBuilder() { return new AutoValue_CelTestContext.Builder() .setCel(DEFAULT_CEL) - .setCelOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) + .setCelOptions(CelOptions.DEFAULT) .setVariableBindings(ImmutableMap.of()) .setResultMatcher(new DefaultResultMatcher()); } diff --git a/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java b/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java index 20d3f32e7..307464abf 100644 --- a/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java +++ b/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java @@ -39,8 +39,7 @@ @RunWith(TestParameterInjector.class) public class RegexLiteralValidatorTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; private static final Cel CEL = CelFactory.plannerCelBuilder().setOptions(CEL_OPTIONS).build(); diff --git a/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java b/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java index 304b214ba..d3c412fba 100644 --- a/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java +++ b/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java @@ -43,8 +43,7 @@ @RunWith(TestParameterInjector.class) public class TimestampLiteralValidatorTest { - private static final CelOptions CEL_OPTIONS = - CelOptions.current().enableHeterogeneousNumericComparisons(true).build(); + private static final CelOptions CEL_OPTIONS = CelOptions.DEFAULT; private static final Cel CEL = CelFactory.plannerCelBuilder().setOptions(CEL_OPTIONS).build(); diff --git a/verifier/src/test/java/dev/cel/verifier/CanonicalizationOptimizerTest.java b/verifier/src/test/java/dev/cel/verifier/CanonicalizationOptimizerTest.java index d5f309c6d..085067e88 100644 --- a/verifier/src/test/java/dev/cel/verifier/CanonicalizationOptimizerTest.java +++ b/verifier/src/test/java/dev/cel/verifier/CanonicalizationOptimizerTest.java @@ -57,7 +57,6 @@ public class CanonicalizationOptimizerTest { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .addMessageTypes(TestAllTypes.getDescriptor()) .addCompilerLibraries( diff --git a/verifier/src/test/java/dev/cel/verifier/CelPolicyVerifierImplTest.java b/verifier/src/test/java/dev/cel/verifier/CelPolicyVerifierImplTest.java index 206316dd5..8c18f4da9 100644 --- a/verifier/src/test/java/dev/cel/verifier/CelPolicyVerifierImplTest.java +++ b/verifier/src/test/java/dev/cel/verifier/CelPolicyVerifierImplTest.java @@ -65,7 +65,6 @@ public final class CelPolicyVerifierImplTest { .setOptions( CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build()) .setStandardMacros(CelStandardMacro.STANDARD_MACROS) .addCompilerLibraries(CelExtensions.bindings()) @@ -770,7 +769,6 @@ public void verifyEquivalence_conformancePolicies_unoptimizedVsOptimized( CelOptions options = CelOptions.current() .populateMacroCalls(true) - .enableHeterogeneousNumericComparisons(true) .build(); Cel baseCel = CelFactory.plannerCelBuilder() diff --git a/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java b/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java index 70a3156f5..a1d22081e 100644 --- a/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java +++ b/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java @@ -38,7 +38,6 @@ import dev.cel.common.CelAbstractSyntaxTree; import dev.cel.common.CelContainer; import dev.cel.common.CelFunctionDecl; -import dev.cel.common.CelOptions; import dev.cel.common.CelOverloadDecl; import dev.cel.common.CelVarDecl; import dev.cel.common.Operator; @@ -82,7 +81,6 @@ public final class CelVerifierZ3ImplTest { private static final Cel CEL = CelFactory.plannerCelBuilder() - .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build()) .setStandardMacros(CelStandardMacro.STANDARD_MACROS) .addMacros(firstElemMacro()) .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))