update test suite structure

tools/celtest/test_runner.go

@@ -395,53 +395,50 @@ func (tr *TestRunner) createTestsFromTextproto(t *testing.T, testSuite *conforma
 func (tr *TestRunner) createTestInputFromPB(t *testing.T, testCase *conformancepb.TestCase) (interpreter.Activation, error) {
 	t.Helper()
 	input := map[string]any{}
-	if testCase.GetInput() == nil {
-		return interpreter.NewActivation(input)
-	}
 	e, err := tr.CreateEnv()
 	if err != nil {
 		return nil, err
 	}
-	switch testInput := testCase.GetInput().GetInputKind().(type) {
-	case *conformancepb.TestInput_ContextExpr:
-		refVal, err := tr.eval(testInput.ContextExpr)
-		if err != nil {
-			return nil, fmt.Errorf("eval(%q) failed: %w", testInput.ContextExpr, err)
+	if testCase.GetInputContext() != nil {
+		if len(testCase.GetInput()) != 0 {
+			return nil, fmt.Errorf("only one of input and input_context can be provided at a time")
 		}
-		ctx, err := refVal.ConvertToNative(
-			reflect.TypeOf((*proto.Message)(nil)).Elem())
-		if err != nil {
-			return nil, fmt.Errorf("context variable is not a valid proto: %w", err)
-		}
-		return cel.ContextProtoVars(ctx.(proto.Message))
-	case *conformancepb.TestInput_Bindings:
-		if testInput.Bindings.GetValues() == nil {
-			return nil, fmt.Errorf("bindings is nil")
-		}
-		for k, v := range testInput.Bindings.GetValues() {
-			switch v.GetKind().(type) {
-			case *conformancepb.InputValue_Value:
-				input[k], err = cel.ProtoAsValue(e.CELTypeAdapter(), v.GetValue())
-				if err != nil {
-					return nil, fmt.Errorf("cel.ProtoAsValue(%q) failed: %w", v, err)
-				}
-			case *conformancepb.InputValue_Expr:
-				input[k], err = tr.eval(v.GetExpr())
-				if err != nil {
-					return nil, fmt.Errorf("eval(%q) failed: %w", v.GetExpr(), err)
-				}
+		switch testInput := testCase.GetInputContext().GetInputContextKind().(type) {
+		case *conformancepb.InputContext_ContextExpr:
+			refVal, err := tr.eval(testInput.ContextExpr)
+			if err != nil {
+				return nil, fmt.Errorf("eval(%q) failed: %w", testInput.ContextExpr, err)
+			}
+			ctx, err := refVal.ConvertToNative(
+				reflect.TypeOf((*proto.Message)(nil)).Elem())
+			if err != nil {
+				return nil, fmt.Errorf("context variable is not a valid proto: %w", err)
 			}
+			return cel.ContextProtoVars(ctx.(proto.Message))
+		case *conformancepb.InputContext_ContextMessage:
+			refVal := e.CELTypeAdapter().NativeToValue(testInput.ContextMessage)
+			ctx, err := refVal.ConvertToNative(reflect.TypeOf((*proto.Message)(nil)).Elem())
+			if err != nil {
+				return nil, fmt.Errorf("context variable is not a valid proto: %w", err)
+			}
+			return cel.ContextProtoVars(ctx.(proto.Message))
 		}
-		return interpreter.NewActivation(input)
-	case *conformancepb.TestInput_ContextMessage:
-		refVal := e.CELTypeAdapter().NativeToValue(testInput.ContextMessage)
-		ctx, err := refVal.ConvertToNative(reflect.TypeOf((*proto.Message)(nil)).Elem())
-		if err != nil {
-			return nil, fmt.Errorf("context variable is not a valid proto: %w", err)
+	}
+	for k, v := range testCase.GetInput() {
+		switch v.GetKind().(type) {
+		case *conformancepb.InputValue_Value:
+			input[k], err = cel.ProtoAsValue(e.CELTypeAdapter(), v.GetValue())
+			if err != nil {
+				return nil, fmt.Errorf("cel.ProtoAsValue(%q) failed: %w", v, err)
+			}
+		case *conformancepb.InputValue_Expr:
+			input[k], err = tr.eval(v.GetExpr())
+			if err != nil {
+				return nil, fmt.Errorf("eval(%q) failed: %w", v.GetExpr(), err)
+			}
 		}
-		return cel.ContextProtoVars(ctx.(proto.Message))
 	}
-	return nil, nil
+	return interpreter.NewActivation(input)
 }
 
 func (tr *TestRunner) createResultMatcherFromPB(t *testing.T, testCase *conformancepb.TestCase) (func(ref.Val, error) TestResult, error) {

tools/go.mod

@@ -3,9 +3,10 @@ module github.com/google/cel-go/tools
 go 1.23.0
 
 require (
-	cel.dev/expr v0.22.1
+	cel.dev/expr v0.23.0
 	github.com/google/cel-go v0.22.0
 	github.com/google/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1
+	github.com/google/go-cmp v0.6.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf
 	google.golang.org/protobuf v1.36.5
 	gopkg.in/yaml.v3 v3.0.1

tools/go.sum

@@ -1,5 +1,5 @@
-cel.dev/expr v0.22.1 h1:xoFEsNh972Yzey8N9TCPx2nDvMN7TMhQEzxLuj/iRrI=
-cel.dev/expr v0.22.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
+cel.dev/expr v0.23.0 h1:wUb94w6OYQS4uXraxo9U+wUAs9jT47Xvl4iPgAwM2ss=
+cel.dev/expr v0.23.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=