From 086efd42be572ab353ce3df2ee3d0c68f9c8e5a9 Mon Sep 17 00:00:00 2001
From: Carina Kothe <carina.kothe@sap.com>
Date: Thu, 20 Jul 2023 16:27:08 +0200
Subject: [PATCH] Implement review comment v2

---
 .../validation/integration_test.go            | 21 ++++++++-----------
 test/matchers/matchers.go                     | 12 +++++------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/internal/controller/eventing/integrationtests/validation/integration_test.go b/internal/controller/eventing/integrationtests/validation/integration_test.go
index 66a27c9a..dc4d2992 100644
--- a/internal/controller/eventing/integrationtests/validation/integration_test.go
+++ b/internal/controller/eventing/integrationtests/validation/integration_test.go
@@ -496,7 +496,7 @@ func Test_Validate_Defaulting(t *testing.T) {
 				},
 			},
 			wantMatches: gomega.And(
-				eventingMatchers.HaveBackendTypeNats(defaultBackend()),
+				eventingMatchers.HaveBackendTypeNats(defaultBackendConfig()),
 				eventingMatchers.HavePublisher(defaultPublisher()),
 				eventingMatchers.HavePublisherResources(defaultPublisherResources()),
 				eventingMatchers.HaveLogging(defaultLogging()),
@@ -516,7 +516,7 @@ func Test_Validate_Defaulting(t *testing.T) {
 				},
 			},
 			wantMatches: gomega.And(
-				eventingMatchers.HaveBackendTypeNats(defaultBackend()),
+				eventingMatchers.HaveBackendTypeNats(defaultBackendConfig()),
 				eventingMatchers.HavePublisher(defaultPublisher()),
 				eventingMatchers.HavePublisherResources(defaultPublisherResources()),
 				eventingMatchers.HaveLogging(defaultLogging()),
@@ -562,7 +562,7 @@ func Test_Validate_Defaulting(t *testing.T) {
 				},
 			},
 			wantMatches: gomega.And(
-				eventingMatchers.HaveBackendTypeNats(defaultBackend()),
+				eventingMatchers.HaveBackendTypeNats(defaultBackendConfig()),
 			),
 		},
 		{
@@ -670,15 +670,12 @@ func Test_Validate_Defaulting(t *testing.T) {
 	}
 }
 
-func defaultBackend() v1alpha1.Backend {
-	return v1alpha1.Backend{
-		Type: typeNats,
-		Config: v1alpha1.BackendConfig{
-			NATSStreamStorageType: storageTypeFile,
-			NATSStreamReplicas:    3,
-			NATSStreamMaxSize:     resource.MustParse("700Mi"),
-			NATSMaxMsgsPerTopic:   1000000,
-		},
+func defaultBackendConfig() v1alpha1.BackendConfig {
+	return v1alpha1.BackendConfig{
+		NATSStreamStorageType: storageTypeFile,
+		NATSStreamReplicas:    3,
+		NATSStreamMaxSize:     resource.MustParse("700Mi"),
+		NATSMaxMsgsPerTopic:   1000000,
 	}
 }
 
diff --git a/test/matchers/matchers.go b/test/matchers/matchers.go
index 7537090e..d7eebdfc 100644
--- a/test/matchers/matchers.go
+++ b/test/matchers/matchers.go
@@ -8,28 +8,28 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 )
 
-func HaveBackendTypeNats(b v1alpha1.Backend) gomegatypes.GomegaMatcher {
+func HaveBackendTypeNats(bc v1alpha1.BackendConfig) gomegatypes.GomegaMatcher {
 	return gomega.And(
 		gomega.WithTransform(
 			func(e *v1alpha1.Eventing) string {
 				return e.Spec.Backends.Type
-			}, gomega.Equal(b.Type)),
+			}, gomega.Equal("NATS")),
 		gomega.WithTransform(
 			func(e *v1alpha1.Eventing) string {
 				return e.Spec.Backends.Config.NATSStreamStorageType
-			}, gomega.Equal(b.Config.NATSStreamStorageType)),
+			}, gomega.Equal(bc.NATSStreamStorageType)),
 		gomega.WithTransform(
 			func(e *v1alpha1.Eventing) int {
 				return e.Spec.Backends.Config.NATSStreamReplicas
-			}, gomega.Equal(b.Config.NATSStreamReplicas)),
+			}, gomega.Equal(bc.NATSStreamReplicas)),
 		gomega.WithTransform(
 			func(e *v1alpha1.Eventing) resource.Quantity {
 				return e.Spec.Backends.Config.NATSStreamMaxSize
-			}, gomega.Equal(b.Config.NATSStreamMaxSize)),
+			}, gomega.Equal(bc.NATSStreamMaxSize)),
 		gomega.WithTransform(
 			func(e *v1alpha1.Eventing) int {
 				return e.Spec.Backends.Config.NATSMaxMsgsPerTopic
-			}, gomega.Equal(b.Config.NATSMaxMsgsPerTopic)),
+			}, gomega.Equal(bc.NATSMaxMsgsPerTopic)),
 	)
 }