fix equal-values rule from testifylint

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yaml

@@ -260,7 +260,6 @@ linters:
     testifylint:
       # TODO: enable them all
       disable:
-        - equal-values # FIXME
         - float-compare
         - go-require
         - require-error

pkg/cmd/util/flag/map_test.go

@@ -68,7 +68,7 @@ func TestSetOfMap(t *testing.T) {
 				require.Error(t, err)
 				return
 			}
-			assert.EqualValues(t, c.expected, m.Data())
+			assert.Equal(t, c.expected, m.Data())
 		})
 	}
 }

pkg/controller/schedule_controller_test.go

@@ -193,7 +193,7 @@ func TestReconcileOfSchedule(t *testing.T) {
 			}
 			if len(test.expectedValidationErrors) > 0 {
 				require.NoError(t, err)
-				assert.EqualValues(t, test.expectedValidationErrors, schedule.Status.ValidationErrors)
+				assert.Equal(t, test.expectedValidationErrors, schedule.Status.ValidationErrors)
 			}
 			if len(test.expectedLastBackup) > 0 {
 				require.NoError(t, err)

pkg/persistence/object_store_test.go

@@ -454,7 +454,7 @@ func TestGetBackupVolumeSnapshots(t *testing.T) {
 
 	res, err = harness.GetBackupVolumeSnapshots("test-backup")
 	assert.NoError(t, err)
-	assert.EqualValues(t, snapshots, res)
+	assert.Equal(t, snapshots, res)
 }
 
 func TestGetBackupItemOperations(t *testing.T) {
@@ -504,7 +504,7 @@ func TestGetBackupItemOperations(t *testing.T) {
 
 	res, err = harness.GetBackupItemOperations("test-backup")
 	assert.NoError(t, err)
-	assert.EqualValues(t, operations, res)
+	assert.Equal(t, operations, res)
 }
 
 func TestGetRestoreItemOperations(t *testing.T) {
@@ -553,7 +553,7 @@ func TestGetRestoreItemOperations(t *testing.T) {
 
 	res, err = harness.GetRestoreItemOperations("test-restore")
 	assert.NoError(t, err)
-	assert.EqualValues(t, operations, res)
+	assert.Equal(t, operations, res)
 }
 
 func TestGetBackupContents(t *testing.T) {
@@ -824,7 +824,7 @@ func TestGetCSIVolumeSnapshotClasses(t *testing.T) {
 
 	res, err = harness.GetCSIVolumeSnapshotClasses("test-backup")
 	assert.NoError(t, err)
-	assert.EqualValues(t, classes, res)
+	assert.Equal(t, classes, res)
 }
 
 func TestGetCSIVolumeSnapshots(t *testing.T) {
@@ -860,7 +860,7 @@ func TestGetCSIVolumeSnapshots(t *testing.T) {
 
 	res, err = harness.GetCSIVolumeSnapshots("test-backup")
 	assert.NoError(t, err)
-	assert.EqualValues(t, snapshots, res)
+	assert.Equal(t, snapshots, res)
 }
 
 type objectStoreGetter map[string]velero.ObjectStore
@@ -1137,8 +1137,8 @@ func TestGetRestoreResults(t *testing.T) {
 	res, err := harness.GetRestoreResults("test-restore")
 
 	assert.NoError(t, err)
-	assert.EqualValues(t, contents["warnings"], res["warnings"])
-	assert.EqualValues(t, contents["errors"], res["errors"])
+	assert.Equal(t, contents["warnings"], res["warnings"])
+	assert.Equal(t, contents["errors"], res["errors"])
 }
 
 func TestGetRestoredResourceList(t *testing.T) {
@@ -1166,7 +1166,7 @@ func TestGetRestoredResourceList(t *testing.T) {
 	res, err := harness.GetRestoredResourceList("test-restore")
 
 	assert.NoError(t, err)
-	assert.EqualValues(t, list["pod"], res["pod"])
+	assert.Equal(t, list["pod"], res["pod"])
 }
 
 func TestPutBackupVolumeInfos(t *testing.T) {

pkg/restore/request_test.go

@@ -63,5 +63,5 @@ func TestRestoredResourceList(t *testing.T) {
 		"v1/Namespace": {"default(created)"},
 	}
 
-	assert.EqualValues(t, expected, request.RestoredResourceList())
+	assert.Equal(t, expected, request.RestoredResourceList())
 }

pkg/restore/restore_test.go

@@ -1411,7 +1411,7 @@ func TestRestoreItems(t *testing.T) {
 			assertEmptyResults(t, warnings, errs)
 			assertRestoredItems(t, h, tc.want)
 			if len(tc.expectedRestoreItems) > 0 {
-				assert.EqualValues(t, tc.expectedRestoreItems, data.RestoredItems)
+				assert.Equal(t, tc.expectedRestoreItems, data.RestoredItems)
 			}
 		})
 	}