Skip to content

Commit 0b1a713

Browse files
committed
update: fips unit test move to use gomega
Signed-off-by: Wen Zhou <[email protected]>
1 parent 00798d2 commit 0b1a713

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

pkg/cluster/cluster_config_test.go

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func (c *erroringClient) Get(ctx context.Context, key types.NamespacedName, obj
3535
}
3636

3737
func TestIsFipsEnabled(t *testing.T) {
38+
t.Parallel()
3839
var genericError = errors.New("generic client error")
3940

4041
// Define test cases
@@ -152,6 +153,9 @@ invalid: yaml`,
152153

153154
for _, tc := range testCases {
154155
t.Run(tc.name, func(t *testing.T) {
156+
t.Parallel()
157+
g := NewWithT(t)
158+
155159
// Create a fake client
156160
var fakeClient client.Client
157161
if tc.configMap != nil || tc.clientErr != nil {
@@ -172,30 +176,22 @@ invalid: yaml`,
172176
}
173177

174178
// Call the function under test
175-
ctx := t.Context()
179+
ctx := context.Background()
176180
result, err := cluster.IsFipsEnabled(ctx, fakeClient)
177181

178182
// Check the result
179-
if result != tc.expectedResult {
180-
t.Errorf("IsFIPSEnabled() = %v, want %v", result, tc.expectedResult)
181-
}
183+
g.Expect(result).To(Equal(tc.expectedResult))
182184

183-
// Check the error. We need to handle nil vs. non-nil errors carefully.
185+
// Check the error
184186
if tc.expectedError != nil {
185-
switch {
186-
case err == nil:
187-
t.Errorf("IsFIPSEnabled() error = nil, want %v", tc.expectedError)
188-
case k8serr.IsNotFound(tc.expectedError):
189-
if !k8serr.IsNotFound(err) {
190-
t.Errorf("IsFipsEnabled() error = %v, want NotFound error", err)
191-
}
192-
default:
193-
if err.Error() != tc.expectedError.Error() {
194-
t.Errorf("IsFIPSEnabled() error = %v, want %v", err, tc.expectedError)
195-
}
187+
g.Expect(err).To(HaveOccurred())
188+
if k8serr.IsNotFound(tc.expectedError) {
189+
g.Expect(k8serr.IsNotFound(err)).To(BeTrue())
190+
} else {
191+
g.Expect(err.Error()).To(Equal(tc.expectedError.Error()))
196192
}
197-
} else if err != nil {
198-
t.Errorf("IsFIPSEnabled() error = %v, want nil", err)
193+
} else {
194+
g.Expect(err).ShouldNot(HaveOccurred())
199195
}
200196
})
201197
}

0 commit comments

Comments
 (0)