Migrate test_all_types proto over to the cel-spec variant by copybara-service[bot] · Pull Request #433 · cel-expr/cel-java · GitHub
Skip to content

Migrate test_all_types proto over to the cel-spec variant #433

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
Aug 21, 2024
Merged

Migrate test_all_types proto over to the cel-spec variant #433

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
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
6 changes: 2 additions & 4 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ java_library(
"//common:options",
"//common:proto_ast",
"//common/ast",
"//common/resources/testdata/proto2:messages_extensions_proto2_java_proto",
"//common/resources/testdata/proto2:messages_proto2_java_proto",
"//common/resources/testdata/proto2:test_all_types_java_proto",
"//common/resources/testdata/proto3:standalone_global_enum_java_proto",
"//common/resources/testdata/proto3:test_all_types_java_proto",
"//common/testing",
"//common/types",
"//common/types:cel_types",
Expand All @@ -38,6 +34,8 @@ java_library(
"//runtime:unknown_attributes",
"@@protobuf~//java/core",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/test/v1/proto2:test_all_types_java_proto",
"@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
"@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
"@com_google_googleapis//google/type:type_java_proto",
"@maven//:com_google_guava_guava",
Expand Down
16 changes: 8 additions & 8 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import dev.cel.expr.Reference;
import dev.cel.expr.Type;
import dev.cel.expr.Type.PrimitiveType;
import com.google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage;
import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
Expand Down Expand Up @@ -98,7 +100,6 @@
import dev.cel.runtime.CelVariableResolver;
import dev.cel.runtime.UnknownContext;
import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
import dev.cel.testing.testdata.proto3.TestAllTypesProto.TestAllTypes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -1021,7 +1022,7 @@ public void program_enumTypeTransitiveResolution() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().resolveTypeDependencies(true).build())
.addMessageTypes(TestAllTypes.getDescriptor())
.addMessageTypes(Proto2ExtensionScopedMessage.getDescriptor())
.setResultType(StructTypeReference.create("google.protobuf.NullValue"))
.setContainer("google.protobuf")
.build();
Expand All @@ -1030,7 +1031,6 @@ public void program_enumTypeTransitiveResolution() throws Exception {
// enum within this 'Value' struct.
// As deep type dependency is enabled, the following evaluation should work by as the
// 'NullValue' enum type is transitively discovered

CelRuntime.Program program =
cel.createProgram(cel.compile("Value{null_value: NullValue.NULL_VALUE}").getAst());
assertThat(program.eval()).isEqualTo(NullValue.NULL_VALUE);
Expand All @@ -1055,7 +1055,7 @@ public void compile_enumTypeTransitiveResolutionFailure() {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().resolveTypeDependencies(false).build())
.addMessageTypes(TestAllTypes.getDescriptor())
.addMessageTypes(Proto2ExtensionScopedMessage.getDescriptor())
.setResultType(StructTypeReference.create("google.protobuf.NullValue"))
.setContainer("google.protobuf")
.build();
Expand Down Expand Up @@ -1817,13 +1817,13 @@ public void programAdvanceEvaluation_partialUnknownMessageFieldPropagates() thro
.addMessageTypes(TestAllTypes.getDescriptor())
.addVar(
"partialMessage1",
StructTypeReference.create("dev.cel.testing.testdata.proto3.TestAllTypes"))
StructTypeReference.create("google.api.expr.test.v1.proto3.TestAllTypes"))
.addVar(
"partialMessage2",
StructTypeReference.create("dev.cel.testing.testdata.proto3.TestAllTypes"))
StructTypeReference.create("google.api.expr.test.v1.proto3.TestAllTypes"))
.setResultType(
StructTypeReference.create("dev.cel.testing.testdata.proto3.NestedTestAllTypes"))
.setContainer("dev.cel.testing.testdata.proto3")
StructTypeReference.create("google.api.expr.test.v1.proto3.NestedTestAllTypes"))
.setContainer("google.api.expr.test.v1.proto3")
.addFunctionBindings()
.build();
Program program =
Expand Down
6 changes: 2 additions & 4 deletions checker/src/test/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ java_library(
"//common/ast",
"//common/internal:env_visitor",
"//common/internal:errors",
"//common/resources/testdata/proto2:messages_extensions_proto2_java_proto",
"//common/resources/testdata/proto2:messages_proto2_java_proto",
"//common/resources/testdata/proto2:test_all_types_java_proto",
"//common/resources/testdata/proto3:standalone_global_enum_java_proto",
"//common/resources/testdata/proto3:test_all_types_java_proto",
"//common/types",
"//common/types:cel_types",
"//common/types:json",
Expand All @@ -49,6 +45,8 @@ java_library(
"//:java_truth",
"@maven//:com_google_truth_extensions_truth_proto_extension",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/test/v1/proto2:test_all_types_java_proto",
"@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
"@com_google_googleapis//google/rpc/context:attribute_context_java_proto",
"@maven//:com_google_guava_guava",
],
Expand Down
6 changes: 3 additions & 3 deletions checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.CelVarDecl;
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.testing.testdata.proto2.TestAllTypesProto.TestAllTypes;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand Down Expand Up @@ -63,7 +63,7 @@ public void toCheckerBuilder_collectionProperties_copied() {
.addMessageTypes(TestAllTypes.getDescriptor())
.addFileTypes(TestAllTypes.getDescriptor().getFile())
.addProtoTypeMasks(
ProtoTypeMask.ofAllFields("dev.cel.testing.testdata.proto2.TestAllTypes"))
ProtoTypeMask.ofAllFields("google.api.expr.test.v1.proto3.TestAllTypes"))
.addLibraries(new CelCheckerLibrary() {});
CelCheckerLegacyImpl celChecker = (CelCheckerLegacyImpl) celCheckerBuilder.build();

Expand Down Expand Up @@ -93,7 +93,7 @@ public void toCheckerBuilder_collectionProperties_areImmutable() {
celCheckerBuilder.addMessageTypes(TestAllTypes.getDescriptor());
celCheckerBuilder.addFileTypes(TestAllTypes.getDescriptor().getFile());
celCheckerBuilder.addProtoTypeMasks(
ProtoTypeMask.ofAllFields("dev.cel.testing.testdata.proto2.TestAllTypes"));
ProtoTypeMask.ofAllFields("google.api.expr.test.v1.proto3.TestAllTypes"));
celCheckerBuilder.addLibraries(new CelCheckerLibrary() {});

assertThat(newCheckerBuilder.getFunctionDecls().build()).isEmpty();
Expand Down
2 changes: 1 addition & 1 deletion checker/src/test/java/dev/cel/checker/CelProtoExprVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import dev.cel.expr.Constant;
import dev.cel.expr.Expr;
import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import com.google.auto.value.AutoValue;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.Operator;
import dev.cel.testing.testdata.proto3.TestAllTypesProto.TestAllTypes;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
Expand Down
35 changes: 12 additions & 23 deletions checker/src/test/java/dev/cel/checker/DescriptorTypeProviderTest.java
View file
Open in desktop
Loading