correct assert.Equal parameters order in tests

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
kubescape · Jun 9, 2023 · 4a8646c · 4a8646c
1 parent 3d8a23f
commit 4a8646c
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/adapters/mockcve_test.go b/adapters/mockcve_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestMockCVEAdapter_DBVersion(t *testing.T) {
 	m := NewMockCVEAdapter()
-	assert.Equal(t, m.DBVersion(context.TODO()), "v1.0.0")
+	assert.Equal(t, "v1.0.0", m.DBVersion(context.TODO()))
 }
 
 func TestMockCVEAdapter_Ready(t *testing.T) {
@@ -26,5 +26,5 @@ func TestMockCVEAdapter_ScanSBOM(t *testing.T) {
 
 func TestMockCVEAdapter_Version(t *testing.T) {
 	m := NewMockCVEAdapter()
-	assert.Equal(t, m.Version(context.TODO()), "Mock CVE 1.0")
+	assert.Equal(t, "Mock CVE 1.0", m.Version(context.TODO()))
 }
diff --git a/adapters/mocksbom_test.go b/adapters/mocksbom_test.go
@@ -24,10 +24,10 @@ func TestMockSBOMAdapter_CreateSBOM_Error(t *testing.T) {
 func TestMockSBOMAdapter_CreateSBOM_Timeout(t *testing.T) {
 	m := NewMockSBOMAdapter(false, true, false)
 	sbom, _ := m.CreateSBOM(context.TODO(), "name", "image", domain.RegistryOptions{})
-	assert.Equal(t, sbom.Status, instanceidhandler.Incomplete)
+	assert.Equal(t, instanceidhandler.Incomplete, sbom.Status)
 }
 
 func TestMockSBOMAdapter_Version(t *testing.T) {
 	m := NewMockSBOMAdapter(false, false, false)
-	assert.Equal(t, m.Version(), "Mock SBOM 1.0")
+	assert.Equal(t, "Mock SBOM 1.0", m.Version())
 }
diff --git a/adapters/v1/armo_test.go b/adapters/v1/armo_test.go
@@ -76,7 +76,7 @@ func TestArmoAdapter_GetCVEExceptions(t *testing.T) {
 				t.Errorf("GetCVEExceptions() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }

diff --git a/adapters/v1/armo_utils_test.go b/adapters/v1/armo_utils_test.go
@@ -158,7 +158,7 @@ func TestGetCVEExceptionMatchCVENameFromList(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			actual := getCVEExceptionMatchCVENameFromList(tc.srcCVEList, tc.CVEName, tc.isFixed)
-			assert.Equal(t, actual, tc.expected)
+			assert.Equal(t, tc.expected, actual)
 		})
 	}
 }
@@ -501,7 +501,7 @@ func Test_summarize(t *testing.T) {
 			sort.Slice(got.SeveritiesStats, func(i, j int) bool {
 				return got.SeveritiesStats[i].Severity < got.SeveritiesStats[j].Severity
 			})
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
diff --git a/adapters/v1/domain_to_armo_test.go b/adapters/v1/domain_to_armo_test.go
@@ -105,7 +105,7 @@ func Test_domainToArmo(t *testing.T) {
 			}
 			got[0].ContainerScanID = ""
 			got[0].Timestamp = 0
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
@@ -162,7 +162,7 @@ func Test_parseLayersPayload(t *testing.T) {
 				t.Errorf("parseLayersPayload() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
diff --git a/adapters/v1/domain_to_syft_test.go b/adapters/v1/domain_to_syft_test.go
@@ -77,7 +77,7 @@ func Test_domainToSpdx(t *testing.T) {
 				t.Errorf("domainToSpdx() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
diff --git a/adapters/v1/grype_test.go b/adapters/v1/grype_test.go
@@ -23,7 +23,7 @@ func Test_grypeAdapter_DBVersion(t *testing.T) {
 	g := NewGrypeAdapterFixedDB()
 	g.Ready(ctx) // need to call ready to load the DB
 	version := g.DBVersion(ctx)
-	assert.Equal(t, version, "sha256:9be2df3d7d657bfb40ddcc68c9d00520ee7f5a34c7a26333f90cf89cefd5668a")
+	assert.Equal(t, "sha256:9be2df3d7d657bfb40ddcc68c9d00520ee7f5a34c7a26333f90cf89cefd5668a", version)
 }
 
 func fileToSBOM(path string) *v1beta1.Document {

diff --git a/adapters/v1/grype_to_domain_test.go b/adapters/v1/grype_to_domain_test.go
@@ -65,7 +65,7 @@ func Test_grypeToDomain(t *testing.T) {
 				t.Errorf("grypeToDomain() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
diff --git a/adapters/v1/syft_to_domain_test.go b/adapters/v1/syft_to_domain_test.go
@@ -91,7 +91,7 @@ func TestSyftAdapter_spdxToDomain(t *testing.T) {
 				t.Errorf("spdxToDomain() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
diff --git a/core/services/mockscan_test.go b/core/services/mockscan_test.go
@@ -144,7 +144,7 @@ func TestMockScanService_ValidateGenerateSBOM(t *testing.T) {
 				t.Errorf("ValidateGenerateSBOM() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }
@@ -183,7 +183,7 @@ func TestMockScanService_ValidateScanCVE(t *testing.T) {
 				t.Errorf("ValidateScanCVE() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			assert.Equal(t, got, tt.want)
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }