Add test runner option to configure a custom test suite parser (#1189)

* add test runner option to configure a custom test suite parser

Author: aakash070

tools/celtest/BUILD.bazel

@@ -67,7 +67,9 @@ go_test(
         "//common/types:go_default_library",
         "//common/types/ref:go_default_library",
         "//policy:go_default_library",
+        "//test:go_default_library",
         "//tools/compiler:go_default_library",
+        "@dev_cel_expr//conformance/test:go_default_library",
         "@in_gopkg_yaml_v3//:go_default_library",
     ]
 )

tools/celtest/test_runner.go

@@ -257,7 +257,8 @@ func (p *tsParser) ParseYAML(path string) (*test.Suite, error) {
 	return testSuite, err
 }
 
-// DefaultTestSuiteParser returns a TestRunnerOption which configures the test runner with a test suite parser.
+// DefaultTestSuiteParser returns a TestRunnerOption which configures the test runner with
+// the default test suite parser.
 func DefaultTestSuiteParser(path string) TestRunnerOption {
 	return func(tr *TestRunner) (*TestRunner, error) {
 		if path == "" {
@@ -269,6 +270,15 @@ func DefaultTestSuiteParser(path string) TestRunnerOption {
 	}
 }
 
+// TestSuiteParserOption returns a TestRunnerOption which configures the test runner with
+// a custom test suite parser.
+func TestSuiteParserOption(p TestSuiteParser) TestRunnerOption {
+	return func(tr *TestRunner) (*TestRunner, error) {
+		tr.testSuiteParser = p
+		return tr, nil
+	}
+}
+
 // TestRunner provides a structure to hold the different components required to execute tests for
 // a list of Input Expressions. The TestRunner can be configured with the following options:
 // - Compiler: The compiler used for parsing and compiling the input expressions.
@@ -353,7 +363,8 @@ func TestExpression(value string) TestRunnerOption {
 	}
 }
 
-// TestCompiler configures a compiler to use for testing.
+// TestCompiler returns a TestRunnerOption which configures the test runner with
+// a compiler created using the set of compiler options.
 func TestCompiler(compileOpts ...any) TestRunnerOption {
 	return func(tr *TestRunner) (*TestRunner, error) {
 		c, err := compiler.NewCompiler(compileOpts...)
@@ -365,6 +376,15 @@ func TestCompiler(compileOpts ...any) TestRunnerOption {
 	}
 }
 
+// CustomTestCompiler returns a TestRunnerOption which configures the test runner with
+// a custom compiler.
+func CustomTestCompiler(c compiler.Compiler) TestRunnerOption {
+	return func(tr *TestRunner) (*TestRunner, error) {
+		tr.Compiler = c
+		return tr, nil
+	}
+}
+
 // AddFileDescriptorSet creates a Test Runner Option which adds a file descriptor set to the test
 // runner. The file descriptor set is used to register proto messages in the global proto registry.
 func AddFileDescriptorSet(path string) TestRunnerOption {

tools/celtest/test_runner_test.go

@@ -23,8 +23,11 @@ import (
 	"github.com/google/cel-go/common/types"
 	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/cel-go/policy"
+	"github.com/google/cel-go/test"
 	"github.com/google/cel-go/tools/compiler"
 	"gopkg.in/yaml.v3"
+
+	conformancepb "cel.dev/expr/conformance/test"
 )
 
 type testCase struct {
@@ -116,10 +119,7 @@ func TestTriggerTestsWithRunnerOptions(t *testing.T) {
 		if err != nil {
 			t.Fatalf("compiler.NewCompiler() failed: %v", err)
 		}
-		compilerOpt := TestRunnerOption(func(tr *TestRunner) (*TestRunner, error) {
-			tr.Compiler = c
-			return tr, nil
-		})
+		compilerOpt := CustomTestCompiler(c)
 		opts := []TestRunnerOption{compilerOpt, testSuiteParser, testCELPolicy}
 		TriggerTests(t, opts...)
 	})
@@ -210,3 +210,49 @@ func TestTriggerTests(t *testing.T) {
 		})
 	}
 }
+
+// TestCustomTestSuiteParser triggers the test runner where the tests are provided by a custom
+// test suite parser configured using TestSuiteParserOption.
+func TestCustomTestSuiteParser(t *testing.T) {
+	t.Run("test custom test suite parser", func(t *testing.T) {
+		celExpr := "a || i + fn(j) == 42"
+		compilerOpts := []any{compiler.EnvironmentFile("testdata/config.yaml"), fnEnvOption()}
+		testRunnerOpts := []TestRunnerOption{
+			TestCompiler(compilerOpts...),
+			TestExpression(celExpr),
+			TestSuiteParserOption(&tsparser{}),
+		}
+		TriggerTests(t, testRunnerOpts...)
+	})
+}
+
+type tsparser struct {
+	TestSuiteParser
+}
+
+// ParseTextproto implements the ParseTextproto method of the TestSuiteParser interface.
+func (p *tsparser) ParseTextproto(_ string) (*conformancepb.TestSuite, error) {
+	return nil, nil
+}
+
+// ParseYAML implements the ParseYAML method of the TestSuiteParser interface.
+func (p *tsparser) ParseYAML(_ string) (*test.Suite, error) {
+	testCase := &test.Case{
+		Name: "sample test case",
+		Input: map[string]*test.InputValue{
+			"i": {Value: 21},
+			"j": {Value: 42},
+			"a": {Value: false},
+		},
+		Output: &test.Output{Value: true},
+	}
+	testSection := &test.Section{
+		Name:  "sample test section",
+		Tests: []*test.Case{testCase},
+	}
+	suite := &test.Suite{
+		Description: "sample test suite",
+		Sections:    []*test.Section{testSection},
+	}
+	return suite, nil
+}

tools/go.mod

@@ -3,8 +3,7 @@ module github.com/google/cel-go/tools
 go 1.23.0
 
 require (
-	cel.dev/expr v0.23.1
-	github.com/bazelbuild/rules_go v0.54.0
+	cel.dev/expr v0.24.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

tools/go.sum

@@ -1,9 +1,7 @@
-cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
-cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
+cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
+cel.dev/expr v0.24.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/bazelbuild/rules_go v0.54.0 h1:D9aCU7j5rdRxg2rXOZX5zHZ395XC0KbgC4rnyaQ3ofM=
-github.com/bazelbuild/rules_go v0.54.0/go.mod h1:T90Gpyq4HDFlsrvtQa2CBdHNJ2P4rAu/uUTmQbanzf0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=