test: add coverage

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
validator-labs · Nov 16, 2023 · 514c74a · 514c74a
1 parent da81af2
commit 514c74a
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 3 deletions.
diff --git a/internal/test/controller_runtime_client.go b/internal/test/controller_runtime_client.go
@@ -33,12 +33,23 @@ func (m SubResourceMock) Patch(ctx context.Context, obj client.Object, patch cli
 
 type ClientMock struct {
 	CreateErrors []error
+	GetErrors    []error
 	UpdateErrors []error
 	SubResourceMock
 }
 
 func (m ClientMock) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
-	return nil
+	var err error
+	var errs []error
+	if m.GetErrors != nil {
+		err, errs = m.GetErrors[0], m.GetErrors[1:]
+	}
+	m = ClientMock{
+		CreateErrors: m.CreateErrors,
+		GetErrors:    errs,
+		UpdateErrors: m.UpdateErrors,
+	}
+	return err
 }
 func (m ClientMock) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
 	return nil
@@ -51,6 +62,7 @@ func (m ClientMock) Create(ctx context.Context, obj client.Object, opts ...clien
 	}
 	m = ClientMock{
 		CreateErrors: errs,
+		GetErrors:    m.GetErrors,
 		UpdateErrors: m.UpdateErrors,
 	}
 	return err
@@ -66,6 +78,7 @@ func (m ClientMock) Update(ctx context.Context, obj client.Object, opts ...clien
 	}
 	m = ClientMock{
 		CreateErrors: m.CreateErrors,
+		GetErrors:    m.GetErrors,
 		UpdateErrors: errs,
 	}
 	return err

diff --git a/pkg/validationresult/validation_result_test.go b/pkg/validationresult/validation_result_test.go
@@ -101,15 +101,24 @@ func TestHandleNewValidationResult(t *testing.T) {
 			res:      vr([]corev1.ConditionStatus{corev1.ConditionFalse}, v1alpha1.ValidationFailed, nil),
 			expected: errors.New("creation failed"),
 		},
+		{
+			name: "Fail (get)",
+			client: test.ClientMock{
+				GetErrors:       []error{errors.New("get failed")},
+				SubResourceMock: test.SubResourceMock{},
+			},
+			res:      vr([]corev1.ConditionStatus{corev1.ConditionFalse}, v1alpha1.ValidationFailed, nil),
+			expected: errors.New("get failed"),
+		},
 		{
 			name: "Fail (status update)",
 			client: test.ClientMock{
 				SubResourceMock: test.SubResourceMock{
-					UpdateErrors: []error{errors.New("update failed")},
+					UpdateErrors: []error{errors.New("status update failed")},
 				},
 			},
 			res:      vr(nil, v1alpha1.ValidationSucceeded, nil),
-			expected: errors.New("update failed"),
+			expected: errors.New("status update failed"),
 		},
 	}
 	for _, c := range cs {
@@ -121,6 +130,48 @@ func TestHandleNewValidationResult(t *testing.T) {
 	}
 }
 
+func TestSafeUpdateValidationResult(t *testing.T) {
+	cs := []struct {
+		name   string
+		client test.ClientMock
+		nn     ktypes.NamespacedName
+		res    *types.ValidationResult
+		resErr error
+	}{
+		{
+			name:   "Pass",
+			client: test.ClientMock{},
+			nn:     ktypes.NamespacedName{Name: "", Namespace: ""},
+			res:    res(corev1.ConditionTrue, v1alpha1.ValidationSucceeded),
+			resErr: nil,
+		},
+		{
+			name: "Fail (get)",
+			client: test.ClientMock{
+				GetErrors: []error{errors.New("get failed")},
+			},
+			nn:     ktypes.NamespacedName{Name: "", Namespace: ""},
+			res:    res(corev1.ConditionTrue, v1alpha1.ValidationSucceeded),
+			resErr: errors.New("get failed"),
+		},
+		{
+			name: "Fail (update)",
+			client: test.ClientMock{
+				SubResourceMock: test.SubResourceMock{
+					UpdateErrors: []error{errors.New("status update failed")},
+				},
+			},
+			nn:     ktypes.NamespacedName{Name: "", Namespace: ""},
+			res:    res(corev1.ConditionTrue, v1alpha1.ValidationSucceeded),
+			resErr: errors.New("status update failed"),
+		},
+	}
+	for _, c := range cs {
+		t.Log(c.name)
+		SafeUpdateValidationResult(c.client, c.nn, c.res, c.resErr, logr.Logger{})
+	}
+}
+
 func TestUpdateValidationResult(t *testing.T) {
 	cs := []struct {
 		name       string