From 74ad27194de6b72a74ec7ff3c52cbedcab27756e Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Fri, 12 Mar 2021 10:32:51 +0200
Subject: [PATCH] Make tests to be independent of cheFlavor (#714)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 pkg/deploy/ingres_test.go | 18 ++++++++++--------
 pkg/deploy/route_test.go  | 24 +++++++++++++-----------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkg/deploy/ingres_test.go b/pkg/deploy/ingres_test.go
index f8b544ac0..ab317de73 100644
--- a/pkg/deploy/ingres_test.go
+++ b/pkg/deploy/ingres_test.go
@@ -44,6 +44,12 @@ func TestIngressSpec(t *testing.T) {
 		expectedIngress       *v1beta1.Ingress
 	}
 
+	cheCluster := &orgv1.CheCluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "eclipse-che",
+		},
+	}
+
 	testCases := []testCase{
 		{
 			name:             "Test custom host",
@@ -63,9 +69,9 @@ func TestIngressSpec(t *testing.T) {
 					Labels: map[string]string{
 						"type":                         "default",
 						"app.kubernetes.io/component":  "test-component",
-						"app.kubernetes.io/instance":   "che",
-						"app.kubernetes.io/managed-by": "che-operator",
-						"app.kubernetes.io/name":       "che",
+						"app.kubernetes.io/instance":   DefaultCheFlavor(cheCluster),
+						"app.kubernetes.io/managed-by": DefaultCheFlavor(cheCluster) + "-operator",
+						"app.kubernetes.io/name":       DefaultCheFlavor(cheCluster),
 					},
 					OwnerReferences: []metav1.OwnerReference{
 						{
@@ -118,11 +124,7 @@ func TestIngressSpec(t *testing.T) {
 			cli := fake.NewFakeClientWithScheme(scheme.Scheme, testCase.initObjects...)
 
 			deployContext := &DeployContext{
-				CheCluster: &orgv1.CheCluster{
-					ObjectMeta: metav1.ObjectMeta{
-						Namespace: "eclipse-che",
-					},
-				},
+				CheCluster: cheCluster,
 				ClusterAPI: ClusterAPI{
 					Client: cli,
 					Scheme: scheme.Scheme,
diff --git a/pkg/deploy/route_test.go b/pkg/deploy/route_test.go
index 93ed2d97d..4de0c13c2 100644
--- a/pkg/deploy/route_test.go
+++ b/pkg/deploy/route_test.go
@@ -46,6 +46,12 @@ func TestRouteSpec(t *testing.T) {
 		expectedRoute       *routev1.Route
 	}
 
+	cheCluster := &orgv1.CheCluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "eclipse-che",
+		},
+	}
+
 	testCases := []testCase{
 		{
 			name:           "Test domain",
@@ -65,9 +71,9 @@ func TestRouteSpec(t *testing.T) {
 					Labels: map[string]string{
 						"type":                         "default",
 						"app.kubernetes.io/component":  "test-component",
-						"app.kubernetes.io/instance":   "che",
-						"app.kubernetes.io/managed-by": "che-operator",
-						"app.kubernetes.io/name":       "che",
+						"app.kubernetes.io/instance":   DefaultCheFlavor(cheCluster),
+						"app.kubernetes.io/managed-by": DefaultCheFlavor(cheCluster) + "-operator",
+						"app.kubernetes.io/name":       DefaultCheFlavor(cheCluster),
 					},
 					OwnerReferences: []metav1.OwnerReference{
 						{
@@ -116,9 +122,9 @@ func TestRouteSpec(t *testing.T) {
 					Labels: map[string]string{
 						"type":                         "default",
 						"app.kubernetes.io/component":  "test-component",
-						"app.kubernetes.io/instance":   "che",
-						"app.kubernetes.io/managed-by": "che-operator",
-						"app.kubernetes.io/name":       "che",
+						"app.kubernetes.io/instance":   DefaultCheFlavor(cheCluster),
+						"app.kubernetes.io/managed-by": DefaultCheFlavor(cheCluster) + "-operator",
+						"app.kubernetes.io/name":       DefaultCheFlavor(cheCluster),
 					},
 					OwnerReferences: []metav1.OwnerReference{
 						{
@@ -159,11 +165,7 @@ func TestRouteSpec(t *testing.T) {
 			cli := fake.NewFakeClientWithScheme(scheme.Scheme, testCase.initObjects...)
 
 			deployContext := &DeployContext{
-				CheCluster: &orgv1.CheCluster{
-					ObjectMeta: metav1.ObjectMeta{
-						Namespace: "eclipse-che",
-					},
-				},
+				CheCluster: cheCluster,
 				ClusterAPI: ClusterAPI{
 					Client: cli,
 					Scheme: scheme.Scheme,