Skip to content

Commit 331045d

Browse files
committed
test moving t.Errorf to t.Error
Signed-off-by: Jan Schoone <[email protected]>
1 parent 75921b5 commit 331045d

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

internal/controller/clusterstack_controller_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ func TestMakeDiff(t *testing.T) {
117117
expectedToDelete := []*csov1alpha1.ClusterStackRelease{csr1}
118118

119119
if !reflect.DeepEqual(toString(toCreate), toString(expectedToCreate)) {
120-
t.Errorf("toCreate is not as expected")
120+
t.Error("toCreate is not as expected")
121121
}
122122

123123
if !reflect.DeepEqual(toString(toDelete), toString(expectedToDelete)) {
124-
t.Errorf("toDelete is not as expected")
124+
t.Error("toDelete is not as expected")
125125
}
126126

127127
// Test Case 2:
@@ -146,11 +146,11 @@ func TestMakeDiff(t *testing.T) {
146146
expectedToDelete = []*csov1alpha1.ClusterStackRelease{csr1, csr2}
147147

148148
if !reflect.DeepEqual(toString(toCreate), toString(expectedToCreate)) {
149-
t.Errorf("toCreate is not as expected. Expected %v, got %v", toString(expectedToCreate), toString(toCreate))
149+
t.Erro("toCreate is not as expected. Expected %v, got %v", toString(expectedToCreate), toString(toCreate))
150150
}
151151

152152
if !reflect.DeepEqual(toString(toDelete), toString(expectedToDelete)) {
153-
t.Errorf("toDelete is not as expected. Expected %v, got %v", toString(expectedToDelete), toString(toDelete))
153+
t.Erro("toDelete is not as expected. Expected %v, got %v", toString(expectedToDelete), toString(toDelete))
154154
}
155155

156156
// Test Case 3
@@ -172,11 +172,11 @@ func TestMakeDiff(t *testing.T) {
172172
expectedToDelete = []*csov1alpha1.ClusterStackRelease{csr1, csr2}
173173

174174
if !reflect.DeepEqual(toString(toCreate), toString(expectedToCreate)) {
175-
t.Errorf("toCreate is not as expected. Expected %v, got %v", toString(expectedToCreate), toString(toCreate))
175+
t.Erro("toCreate is not as expected. Expected %v, got %v", toString(expectedToCreate), toString(toCreate))
176176
}
177177

178178
if !reflect.DeepEqual(toString(toDelete), toString(expectedToDelete)) {
179-
t.Errorf("toDelete is not as expected. Expected %v, got %v", toString(expectedToDelete), toString(toDelete))
179+
t.Erro("toDelete is not as expected. Expected %v, got %v", toString(expectedToDelete), toString(toDelete))
180180
}
181181
}
182182

@@ -235,17 +235,17 @@ func TestGetLatestReadyClusterStackRelease(t *testing.T) {
235235
// Call the function being tested
236236
latest, k8sVersion, err := getLatestReadyClusterStackRelease(clusterStackReleases)
237237
if err != nil {
238-
t.Errorf("Expected err to be nil, but got: %v", err)
238+
t.Error("Expected err to be nil, but got: %v", err)
239239
}
240240
expectedLatest := "docker-ferrol-1-21-v3"
241241
if latest == nil {
242-
t.Errorf("Expected latest to be non-nil, but got nil")
242+
t.Error("Expected latest to be non-nil, but got nil")
243243
} else if *latest != expectedLatest {
244-
t.Errorf("Expected latest to be %s, but got %s", expectedLatest, *latest)
244+
t.Error("Expected latest to be %s, but got %s", expectedLatest, *latest)
245245
}
246246
expectedK8sVersion := "v1.21"
247247
if k8sVersion != expectedK8sVersion {
248-
t.Errorf("Expected k8sVersion to be %s, but got %s", expectedK8sVersion, k8sVersion)
248+
t.Error("Expected k8sVersion to be %s, but got %s", expectedK8sVersion, k8sVersion)
249249
}
250250
})
251251

@@ -257,13 +257,13 @@ func TestGetLatestReadyClusterStackRelease(t *testing.T) {
257257

258258
latest, k8sVersion, err := getLatestReadyClusterStackRelease(emptyClusterStackReleases)
259259
if err != nil {
260-
t.Errorf("Expected err to be nil, but got: %v", err)
260+
t.Error("Expected err to be nil, but got: %v", err)
261261
}
262262
if latest != nil {
263-
t.Errorf("Expected latest to be nil, but got %v", *latest)
263+
t.Error("Expected latest to be nil, but got %v", *latest)
264264
}
265265
if k8sVersion != "" {
266-
t.Errorf("Expected k8sVersion to be an empty string, but got %s", k8sVersion)
266+
t.Error("Expected k8sVersion to be an empty string, but got %s", k8sVersion)
267267
}
268268
})
269269
}
@@ -323,15 +323,15 @@ func TestGetUsableClusterStackReleaseVersions(t *testing.T) {
323323
// Call the function
324324
usableVersions, err := getUsableClusterStackReleaseVersions(clusterStackReleases)
325325
if err != nil {
326-
t.Errorf("Expected no error, but got %v", err)
326+
t.Error("Expected no error, but got %v", err)
327327
}
328328

329329
// Expected result
330330
expectedVersions := []string{"v1", "v3"}
331331

332332
// Check if the result matches the expected versions
333333
if !equalStringSlices(usableVersions, expectedVersions) {
334-
t.Errorf("Expected versions %v, but got %v", expectedVersions, usableVersions)
334+
t.Error("Expected versions %v, but got %v", expectedVersions, usableVersions)
335335
}
336336
})
337337

@@ -341,15 +341,15 @@ func TestGetUsableClusterStackReleaseVersions(t *testing.T) {
341341
// Call the function
342342
usableVersions, err := getUsableClusterStackReleaseVersions(nil)
343343
if err != nil {
344-
t.Errorf("Expected no error, but got %v", err)
344+
t.Error("Expected no error, but got %v", err)
345345
}
346346

347347
// Expected result
348348
expectedVersions := []string{}
349349

350350
// Check if the result matches the expected versions
351351
if !equalStringSlices(usableVersions, expectedVersions) {
352-
t.Errorf("Expected versions %v, but got %v", expectedVersions, usableVersions)
352+
t.Error("Expected versions %v, but got %v", expectedVersions, usableVersions)
353353
}
354354
})
355355
}
@@ -374,7 +374,7 @@ func TestGetClusterStackReleasesInSpec(t *testing.T) {
374374
// check if all the three versions given in the spec are present in the result
375375
for k := range result {
376376
if _, ok := expectedResult[k]; !ok {
377-
t.Errorf("Expected result %v, not found", k)
377+
t.Error("Expected result %v, not found", k)
378378
}
379379
}
380380
}

0 commit comments

Comments
 (0)