Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update runtime tests to refer to canonical cel conformance protos. #510

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
Dec 3, 2024
Merged

Update runtime tests to refer to canonical cel conformance protos. #510

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 6 runtime/src/test/java/dev/cel/runtime/ActivationTest.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.NestedTestAllTypes;
import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes.NestedMessage;
import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.NullValue;
import dev.cel.common.CelOptions;
import dev.cel.expr.conformance.proto3.NestedTestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down
6 changes: 4 additions & 2 deletions 6 runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

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

import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import dev.cel.common.CelException;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import org.junit.Assert;
import org.junit.Test;
Expand Down Expand Up @@ -68,14 +68,16 @@ public void toRuntimeBuilder_collectionProperties_copied() {
celRuntimeBuilder.addFileTypes(TestAllTypes.getDescriptor().getFile());
celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
int originalFileTypesSize =
((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
(CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(8);
assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions 6 runtime/src/test/java/dev/cel/runtime/CelRuntimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;

import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import com.google.api.expr.v1alpha1.Constant;
import com.google.api.expr.v1alpha1.Expr;
import com.google.api.expr.v1alpha1.Type.PrimitiveType;
Expand Down Expand Up @@ -46,6 +45,7 @@
import dev.cel.common.types.StructTypeReference;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelStandardMacro;
import dev.cel.parser.CelUnparserFactory;
import dev.cel.policy.CelPolicyConfig;
Expand Down Expand Up @@ -363,7 +363,7 @@ public void trace_select() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer("google.api.expr.test.v1.proto3")
.setContainer("cel.expr.conformance.proto3")
.build();
CelAbstractSyntaxTree ast = cel.compile("TestAllTypes{single_int64: 3}.single_int64").getAst();

Expand All @@ -382,7 +382,7 @@ public void trace_struct() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer("google.api.expr.test.v1.proto3")
.setContainer("cel.expr.conformance.proto3")
.build();
CelAbstractSyntaxTree ast = cel.compile("TestAllTypes{}").getAst();

Expand Down
2 changes: 1 addition & 1 deletion 2 runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java_library(
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"//:java_truth",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@maven//:com_google_guava_guava",
],
)
Expand Down
2 changes: 1 addition & 1 deletion 2 runtime/src/test/java/dev/cel/runtime/async/CelAsyncRuntimeImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import dev.cel.expr.Type;
import dev.cel.expr.Type.ListType;
import dev.cel.expr.Type.PrimitiveType;
import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All @@ -35,6 +34,7 @@
import dev.cel.common.CelOptions;
import dev.cel.common.testing.RepeatedTestProvider;
import dev.cel.common.types.SimpleType;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelAttributeParser;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.