chore: improve e2e test registration (#400)

Signed-off-by: Kavindu Dodanduwa <[email protected]>

Author: Kavindu-Dodan

providers/flagd-in-process/e2e/evaluation_test.go

@@ -25,9 +25,10 @@ func TestEvaluationFlagdInProcess(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeEvaluationScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeTestSuite(func() openfeature.FeatureProvider {
 			return in_process.NewProvider(context.Background(), in_process.WithSourceURI("localhost:9090"), in_process.WithSourceType(in_process.SourceTypeGrpc))
 		}),
+		ScenarioInitializer: integration.InitializeEvaluationScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../spec/specification/assets/gherkin/evaluation.feature"},

providers/flagd-in-process/e2e/json_evalutor_test.go

@@ -23,9 +23,10 @@ func TestJsonEvaluatorFlagdInProcess(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeFlagdJsonScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeFlagdJsonTestSuite(func() openfeature.FeatureProvider {
 			return in_process.NewProvider(context.Background(), in_process.WithSourceURI("localhost:9090"), in_process.WithSourceType(in_process.SourceTypeGrpc))
 		}),
+		ScenarioInitializer: integration.InitializeFlagdJsonScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../flagd-testbed/gherkin/flagd-json-evaluator.feature"},

providers/flagd/e2e/evaluation_test.go

@@ -24,9 +24,10 @@ func TestETestEvaluationFlagdInRPC(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeEvaluationScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeTestSuite(func() openfeature.FeatureProvider {
 			return flagd.NewProvider(flagd.WithPort(8013))
 		}),
+		ScenarioInitializer: integration.InitializeEvaluationScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../spec/specification/assets/gherkin/evaluation.feature"},
@@ -52,9 +53,10 @@ func TestJsonEvaluatorFlagdInProcess(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeEvaluationScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeTestSuite(func() openfeature.FeatureProvider {
 			return flagd.NewProvider(flagd.WithInProcessResolver(), flagd.WithPort(9090))
 		}),
+		ScenarioInitializer: integration.InitializeEvaluationScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../spec/specification/assets/gherkin/evaluation.feature"},

providers/flagd/e2e/json_evalutor_test.go

@@ -22,9 +22,10 @@ func TestJsonEvaluatorInRPC(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeFlagdJsonScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeFlagdJsonTestSuite(func() openfeature.FeatureProvider {
 			return flagd.NewProvider(flagd.WithPort(8013))
 		}),
+		ScenarioInitializer: integration.InitializeFlagdJsonScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../flagd-testbed/gherkin/flagd-json-evaluator.feature"},
@@ -50,9 +51,10 @@ func TestJsonEvaluatorInProcess(t *testing.T) {
 
 	testSuite := godog.TestSuite{
 		Name: name,
-		ScenarioInitializer: integration.InitializeFlagdJsonScenario(func() openfeature.FeatureProvider {
+		TestSuiteInitializer: integration.InitializeFlagdJsonTestSuite(func() openfeature.FeatureProvider {
 			return flagd.NewProvider(flagd.WithInProcessResolver(), flagd.WithPort(9090))
 		}),
+		ScenarioInitializer: integration.InitializeFlagdJsonScenario,
 		Options: &godog.Options{
 			Format:   "pretty",
 			Paths:    []string{"../../../flagd-testbed/gherkin/flagd-json-evaluator.feature"},

tests/flagd/pkg/integration/evaluation.go

@@ -10,14 +10,14 @@ import (
 	"github.com/open-feature/go-sdk/pkg/openfeature"
 )
 
-func InitializeEvaluationScenario(providerSupplier func() openfeature.FeatureProvider) func(*godog.ScenarioContext) {
+// InitializeTestSuite register provider supplier for this test run
+func InitializeTestSuite(providerSupplier func() openfeature.FeatureProvider) func(*godog.TestSuiteContext) {
 	test_provider_supplier = providerSupplier
-
-	return initializeEvaluationScenario
+	return func(suiteContext *godog.TestSuiteContext) {}
 }
 
 // InitializeEvaluationScenario initializes the evaluation test scenario
-func initializeEvaluationScenario(ctx *godog.ScenarioContext) {
+func InitializeEvaluationScenario(ctx *godog.ScenarioContext) {
 	ctx.Step(`^a provider is registered$`, aFlagdProviderIsSet)
 
 	ctx.Step(`^a boolean flag with key "([^"]*)" is evaluated with default value "([^"]*)"$`, aBooleanFlagWithKeyIsEvaluatedWithDefaultValue)

tests/flagd/pkg/integration/flagd_json_evaluator.go

@@ -18,15 +18,15 @@ type ctxDefaultKey struct{}
 // ctxValueKey is the key used to pass the value across context.Context
 type ctxValueKey struct{}
 
-func InitializeFlagdJsonScenario(providerSupplier func() openfeature.FeatureProvider) func(*godog.ScenarioContext) {
-
+// InitializeFlagdJsonTestSuite register provider supplier and register test steps
+func InitializeFlagdJsonTestSuite(providerSupplier func() openfeature.FeatureProvider) func(*godog.TestSuiteContext) {
 	test_provider_supplier = providerSupplier
 
-	return initializeFlagdJsonScenario
+	return func(suiteContext *godog.TestSuiteContext) {}
 }
 
-// initializeFlagdJsonScenario initializes the flagd json evaluator test scenario
-func initializeFlagdJsonScenario(ctx *godog.ScenarioContext) {
+// InitializeFlagdJsonScenario initializes the flagd json evaluator test scenario
+func InitializeFlagdJsonScenario(ctx *godog.ScenarioContext) {
 	ctx.Step(`^a flagd provider is set$`, aFlagdProviderIsSet)
 	ctx.Step(`^a string flag with key "([^"]*)" is evaluated with default value "([^"]*)"$`, aFlagdStringFlagWithKeyIsEvaluatedWithDefaultValue)
 	ctx.Step(`^a context containing a key "([^"]*)", with value "([^"]*)"$`, aContextContainingAKeyWithValue)