Skip to content

Commit

Permalink
Test cleanup to migrate away from checker decls (#742)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TristonianJones
TristonianJones authored Jun 16, 2023
1 parent ddfb0d2 commit d69f12a
Show file tree
Hide file tree
Showing 5 changed files with 499 additions and 463 deletions.
2 changes: 1 addition & 1 deletion interpreter/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ go_test(
],
deps = [
"//checker:go_default_library",
"//checker/decls:go_default_library",
"//common/containers:go_default_library",
"//common/debug:go_default_library",
"//common/decls:go_default_library",
"//common/functions:go_default_library",
"//common/operators:go_default_library",
"//common/stdlib:go_default_library",
Expand Down
78 changes: 39 additions & 39 deletions interpreter/attributes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"testing"

"github.com/google/cel-go/checker"
"github.com/google/cel-go/checker/decls"
"github.com/google/cel-go/common"
"github.com/google/cel-go/common/containers"
"github.com/google/cel-go/common/decls"
"github.com/google/cel-go/common/stdlib"
"github.com/google/cel-go/common/types"
"github.com/google/cel-go/common/types/ref"
Expand Down Expand Up @@ -858,15 +858,15 @@ func TestAttributeMissingMsgUnknownField(t *testing.T) {
func TestAttributeStateTracking(t *testing.T) {
var tests = []struct {
expr string
env []*exprpb.Decl
vars []*decls.VariableDecl
in any
out ref.Val
attrs []*AttributePattern
state map[int64]any
}{
{
expr: `[{"field": true}][0].field`,
env: []*exprpb.Decl{},
vars: []*decls.VariableDecl{},
in: map[string]any{},
out: types.True,
state: map[int64]any{
Expand All @@ -880,10 +880,10 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a[1]['two']`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(
decls.Int,
decls.NewMapType(decls.String, decls.Bool))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(
decls.IntType,
decls.MapType(decls.StringType, decls.BoolType))),
},
in: map[string]any{
"a": map[int64]any{
Expand All @@ -902,10 +902,10 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a[1][2][3]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(
decls.Int,
decls.NewMapType(decls.Dyn, decls.Dyn))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(
decls.IntType,
decls.MapType(decls.DynType, decls.DynType))),
},
in: map[string]any{
"a": map[int64]any{
Expand All @@ -930,10 +930,10 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a[1][2][a[1][1]]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(
decls.Int,
decls.NewMapType(decls.Dyn, decls.Dyn))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(
decls.IntType,
decls.MapType(decls.DynType, decls.DynType))),
},
in: map[string]any{
"a": map[int64]any{
Expand Down Expand Up @@ -966,9 +966,9 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `true ? a : b`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.String),
decls.NewVar("b", decls.String),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.StringType),
decls.NewVariable("b", decls.StringType),
},
in: map[string]any{
"a": "hello",
Expand All @@ -982,9 +982,9 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `(a.size() != 0 ? a : b)[0]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewListType(decls.String)),
decls.NewVar("b", decls.NewListType(decls.String)),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.ListType(decls.StringType)),
decls.NewVariable("b", decls.ListType(decls.StringType)),
},
in: map[string]any{
"a": []string{"hello", "world"},
Expand All @@ -1006,8 +1006,8 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a.?b.c`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.NewMapType(decls.String, decls.String))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.MapType(decls.StringType, decls.StringType))),
},
in: map[string]any{
"a": map[string]any{"b": map[string]any{"c": "world"}},
Expand All @@ -1022,8 +1022,8 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a.?b.c`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.NewMapType(decls.String, decls.String))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.MapType(decls.StringType, decls.StringType))),
},
in: map[string]any{
"a": map[string]any{"b": map[string]string{"random": "value"}},
Expand All @@ -1038,8 +1038,8 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `a.b.c`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.NewMapType(decls.String, decls.String))),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.MapType(decls.StringType, decls.StringType))),
},
in: map[string]any{
"a": map[string]any{"b": map[string]any{"c": "world"}},
Expand All @@ -1054,9 +1054,9 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `m[has(a.b)]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.String)),
decls.NewVar("m", decls.NewMapType(decls.Bool, decls.String)),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.StringType)),
decls.NewVariable("m", decls.MapType(decls.BoolType, decls.StringType)),
},
in: map[string]any{
"a": map[string]string{"b": ""},
Expand All @@ -1066,9 +1066,9 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `m[?has(a.b)]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.String)),
decls.NewVar("m", decls.NewMapType(decls.Bool, decls.String)),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.StringType)),
decls.NewVariable("m", decls.MapType(decls.BoolType, decls.StringType)),
},
in: map[string]any{
"a": map[string]string{"b": ""},
Expand All @@ -1078,9 +1078,9 @@ func TestAttributeStateTracking(t *testing.T) {
},
{
expr: `m[?has(a.b.c)]`,
env: []*exprpb.Decl{
decls.NewVar("a", decls.NewMapType(decls.String, decls.Dyn)),
decls.NewVar("m", decls.NewMapType(decls.Bool, decls.String)),
vars: []*decls.VariableDecl{
decls.NewVariable("a", decls.MapType(decls.StringType, decls.DynType)),
decls.NewVariable("m", decls.MapType(decls.BoolType, decls.StringType)),
},
in: partialActivation(
map[string]any{
Expand Down Expand Up @@ -1114,9 +1114,9 @@ func TestAttributeStateTracking(t *testing.T) {
t.Fatalf("checker.NewEnv() failed: %v", err)
}
env.Add(stdlib.FunctionExprDecls()...)
env.Add(optionalSignatures()...)
if tc.env != nil {
env.Add(tc.env...)
env.Add(funcExprDecls(t, optionalDecls(t)...)...)
if tc.vars != nil {
env.Add(varExprDecls(t, tc.vars...)...)
}
checked, errors := checker.Check(parsed, src, env)
if len(errors.GetErrors()) != 0 {
Expand Down
Loading

0 comments on commit d69f12a

Please sign in to comment.