#221 fix some tests

cloudogu · Dec 20, 2024 · 0d6ab29 · 0d6ab29
1 parent 4bfac30
commit 0d6ab29
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/controllers/doguSupportManager_test.go b/controllers/doguSupportManager_test.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -130,7 +131,7 @@ func Test_doguSupportManager_updateDeployment(t *testing.T) {
 		ldapCr := readDoguCr(t, ldapCrBytes)
 		ldapCr.Namespace = namespace
 		ldapCr.Spec.SupportMode = true
-		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, "ldap").Return(ldap, nil)
+		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ldap")).Return(ldap, nil)
 
 		deployment := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "ldap", Namespace: namespace}}
 		err := sut.supportManager.client.Create(testCtx, deployment)
@@ -183,7 +184,7 @@ func Test_doguSupportManager_updateDeployment(t *testing.T) {
 		// given
 		sut := getDoguSupportManagerWithMocks(t, getTestScheme())
 		ldapCr := readDoguCr(t, ldapCrBytes)
-		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, "ldap").Return(nil, assert.AnError)
+		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ldap")).Return(nil, assert.AnError)
 
 		deployment := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "ldap", Namespace: namespace}}
 		err := sut.supportManager.client.Create(testCtx, deployment)
@@ -202,7 +203,7 @@ func Test_doguSupportManager_updateDeployment(t *testing.T) {
 		sut := getDoguSupportManagerWithMocks(t, getTestScheme())
 		ldap := readDoguDescriptor(t, ldapDoguDescriptorBytes)
 		ldapCr := readDoguCr(t, ldapCrBytes)
-		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, "ldap").Return(ldap, nil)
+		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ldap")).Return(ldap, nil)
 		podSpec := corev1.PodTemplateSpec{Spec: corev1.PodSpec{}}
 		sut.podTemplateGenerator.EXPECT().GetPodTemplate(testCtx, ldapCr, ldap).Return(&podSpec, nil)
 
@@ -223,7 +224,7 @@ func Test_doguSupportManager_HandleSupportMode(t *testing.T) {
 		ldapCr := readDoguCr(t, ldapCrBytes)
 		ldapCr.Namespace = namespace
 		ldapCr.Spec.SupportMode = true
-		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, "ldap").Return(ldap, nil)
+		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ldap")).Return(ldap, nil)
 		sut.recorderMock.On("Eventf", ldapCr, "Normal", "Support", "Support flag changed to %t. Deployment updated.", true)
 
 		podTemplateSpec := corev1.PodTemplateSpec{
@@ -302,7 +303,7 @@ func Test_doguSupportManager_HandleSupportMode(t *testing.T) {
 		ldapCr := readDoguCr(t, ldapCrBytes)
 		ldapCr.Namespace = namespace
 		ldapCr.Spec.SupportMode = true
-		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, "ldap").Return(nil, assert.AnError)
+		sut.localDoguFetcherMock.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ldap")).Return(nil, assert.AnError)
 
 		deployment := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "ldap", Namespace: namespace},
 			Spec: appsv1.DeploymentSpec{

diff --git a/controllers/doguUpgradeManager_test.go b/controllers/doguUpgradeManager_test.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
 	"github.com/cloudogu/k8s-dogu-operator/v3/api/ecoSystem"
 	"github.com/cloudogu/k8s-dogu-operator/v3/controllers/util"
 	"github.com/stretchr/testify/mock"
@@ -124,7 +125,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Eventf", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Executing upgrade from %s to %s...", "4.2.3-10", upgradeVersion)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(redmineDoguUpgrade, nil, nil)
@@ -182,7 +183,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Eventf", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Executing upgrade from %s to %s...", "4.2.3-10", upgradeVersion)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(redmineDoguInstalled, nil)
 
 		devDoguMap := &v2.DevelopmentDoguMap{
 			ObjectMeta: metav1.ObjectMeta{
@@ -251,7 +252,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Eventf", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Executing upgrade from %s to %s...", "4.2.3-10", "4.2.3-11")
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(redmineDoguUpgrade, nil, nil)
@@ -301,7 +302,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Event", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Checking premises...")
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(redmineDoguUpgrade, nil, nil)
@@ -349,7 +350,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock := newMockEventRecorder(t)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(nil, nil, assert.AnError)
@@ -391,7 +392,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock := newMockEventRecorder(t)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "redmine").Return(nil, assert.AnError)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("redmine")).Return(nil, assert.AnError)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 
@@ -458,7 +459,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Eventf", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Executing upgrade from %s to %s...", "4.2.3-10", upgradeVersion)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(redmineDoguUpgrade, nil, nil)
@@ -500,7 +501,7 @@ func Test_doguUpgradeManager_Upgrade(t *testing.T) {
 		recorderMock.On("Eventf", redmineCr, corev1.EventTypeNormal, upgrade.EventReason, "Executing upgrade from %s to %s...", "4.2.3-10", upgradeVersion)
 
 		localFetcher := newMockLocalDoguFetcher(t)
-		localFetcher.EXPECT().FetchInstalled(testCtx, "").Return(redmineDoguInstalled, nil)
+		localFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("")).Return(redmineDoguInstalled, nil)
 
 		resourceFetcher := newMockResourceDoguFetcher(t)
 		resourceFetcher.On("FetchWithResource", testCtx, redmineCr).Return(redmineDoguUpgrade, nil, nil)

diff --git a/controllers/dogu_controller_test.go b/controllers/dogu_controller_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
 	appsv1 "k8s.io/api/apps/v1"
 	"testing"
 	"time"
@@ -42,7 +43,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 		recorder := newMockEventRecorder(t)
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -73,7 +74,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 		recorder := newMockEventRecorder(t)
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -105,7 +106,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 		recorder.On("Eventf", testDoguCr, v1.EventTypeWarning, operatorEventReason, mock.Anything, mock.Anything)
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -165,7 +166,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -200,7 +201,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -239,7 +240,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -315,7 +316,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -354,7 +355,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()
@@ -431,7 +432,7 @@ func Test_evaluateRequiredOperation(t *testing.T) {
 
 		localDogu := &core.Dogu{Name: "official/ledogu", Version: "42.0.0-1"}
 		localDoguFetcher := newMockLocalDoguFetcher(t)
-		localDoguFetcher.EXPECT().FetchInstalled(testCtx, "ledogu").Return(localDogu, nil)
+		localDoguFetcher.EXPECT().FetchInstalled(testCtx, cescommons.SimpleName("ledogu")).Return(localDogu, nil)
 
 		doguService := &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "ledogu"}}
 		fakeClient := fake.NewClientBuilder().WithObjects(doguService).Build()