Skip to content

Commit 1c45450

Browse files
committed
Unit test enhancements
1 parent 34a74ad commit 1c45450

File tree

2 files changed

+634
-84
lines changed

2 files changed

+634
-84
lines changed

utils/reconciler_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestGetDiscoveryClient(t *testing.T) {
4747
logger := zap.New()
4848
logf.SetLogger(logger)
4949

50-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
50+
runtimecomponent := createRuntimeComponent(objMeta, spec)
5151
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
5252
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
5353
cl := fakeclient.NewFakeClient(objs...)
@@ -67,7 +67,7 @@ func TestCreateOrUpdate(t *testing.T) {
6767
logf.SetLogger(logger)
6868
serviceAccount := &corev1.ServiceAccount{ObjectMeta: defaultMeta}
6969

70-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
70+
runtimecomponent := createRuntimeComponent(objMeta, spec)
7171
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
7272
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
7373
cl := fakeclient.NewFakeClient(objs...)
@@ -88,7 +88,7 @@ func TestDeleteResources(t *testing.T) {
8888
logger := zap.New()
8989
logf.SetLogger(logger)
9090

91-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
91+
runtimecomponent := createRuntimeComponent(objMeta, spec)
9292
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
9393
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
9494
cl := fakeclient.NewFakeClient(objs...)
@@ -141,7 +141,7 @@ func TestGetOpConfigMap(t *testing.T) {
141141
},
142142
}
143143

144-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
144+
runtimecomponent := createRuntimeComponent(objMeta, spec)
145145
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
146146
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
147147
cl := fakeclient.NewFakeClient(objs...)
@@ -167,7 +167,7 @@ func TestManageError(t *testing.T) {
167167
logf.SetLogger(logger)
168168
err := fmt.Errorf("test-error")
169169

170-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
170+
runtimecomponent := createRuntimeComponent(objMeta, spec)
171171
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
172172
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
173173
cl := fakeclient.NewFakeClient(objs...)
@@ -188,7 +188,7 @@ func TestManageSuccess(t *testing.T) {
188188
logger := zap.New()
189189
logf.SetLogger(logger)
190190

191-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
191+
runtimecomponent := createRuntimeComponent(objMeta, spec)
192192
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
193193
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
194194
cl := fakeclient.NewFakeClient(objs...)
@@ -207,7 +207,7 @@ func TestIsGroupVersionSupported(t *testing.T) {
207207
logger := zap.New()
208208
logf.SetLogger(logger)
209209

210-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
210+
runtimecomponent := createRuntimeComponent(objMeta, spec)
211211
objs, s := []runtime.Object{runtimecomponent}, scheme.Scheme
212212
s.AddKnownTypes(appstacksv1beta2.GroupVersion, runtimecomponent)
213213
cl := fakeclient.NewFakeClient(objs...)
@@ -244,7 +244,7 @@ func TestIsGroupVersionSupported(t *testing.T) {
244244
func testGetSvcTLSValues(t *testing.T) {
245245
// Configure the runtime component
246246

247-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
247+
runtimecomponent := createRuntimeComponent(objMeta, spec)
248248
expose := true
249249
runtimecomponent.Spec.Expose = &expose
250250
runtimecomponent.Spec.Service = &appstacksv1beta2.RuntimeComponentService{
@@ -285,7 +285,7 @@ func testGetSvcTLSValues(t *testing.T) {
285285
// testGetRouteTLSValues test the function GetRouteTLSValues in reconciler.go.
286286
func testGetRouteTLSValues(t *testing.T) {
287287
// Configure the rumtime component
288-
runtimecomponent := createRuntimeComponent(name, namespace, spec)
288+
runtimecomponent := createRuntimeComponent(objMeta, spec)
289289
terminationPolicy := routev1.TLSTerminationReencrypt
290290
secretRefName := "my-app-route-tls"
291291
runtimecomponent.Spec.Expose = &expose

0 commit comments

Comments
 (0)