Merge branch 'ginkgo_removal' into new_log_package_with_slog

redhat-best-practices-for-k8s · Nov 30, 2023 · d805c0c · d805c0c
2 parents 17ef07a + a3a6492
commit d805c0c
Show file tree

Hide file tree

Showing 13 changed files with 269 additions and 162 deletions.
diff --git a/cmd/tnf/claim/compare/compare_test.go b/cmd/tnf/claim/compare/compare_test.go
@@ -87,7 +87,7 @@ func Test_claimCompareFilesfunc(t *testing.T) {
 			}
 
 			if err != nil {
-				assert.Equal(t, err.Error(), tc.expectedError)
+				assert.Equal(t, tc.expectedError, err.Error())
 			} else {
 				// Read the output from the pipe.
 				out, _ := io.ReadAll(r)

diff --git a/cmd/tnf/claim/compare/testcases/testcases_test.go b/cmd/tnf/claim/compare/testcases/testcases_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/test-network-function/cnf-certification-test/cmd/tnf/pkg/claim"
-	"gotest.tools/v3/assert"
 )
 
 func TestGetTestCasesResultsMap(t *testing.T) {
@@ -84,7 +84,7 @@ func TestGetTestCasesResultsMap(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			resultsMap := getTestCasesResultsMap(tc.results)
-			assert.Equal(t, true, reflect.DeepEqual(tc.expectedTestCasesResultsMap, resultsMap))
+			assert.True(t, reflect.DeepEqual(tc.expectedTestCasesResultsMap, resultsMap))
 		})
 	}
 }
@@ -143,7 +143,7 @@ func TestGetMergedTestCasesNames(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			tcMergedNamesList := getMergedTestCasesNames(tc.claim1Results, tc.claim2Results)
-			assert.Equal(t, true, reflect.DeepEqual(tc.expectedMergedTcNames, tcMergedNamesList))
+			assert.True(t, reflect.DeepEqual(tc.expectedMergedTcNames, tcMergedNamesList))
 		})
 	}
 }
@@ -308,7 +308,7 @@ func TestGetDiffReport(t *testing.T) {
 
 			// Check test case results differences
 			t.Logf("diffs: %+v", diffReport.TestCases)
-			assert.Equal(t, true, reflect.DeepEqual(tc.expectedDiffReport.TestCases, diffReport.TestCases))
+			assert.True(t, reflect.DeepEqual(tc.expectedDiffReport.TestCases, diffReport.TestCases))
 
 			// Check count
 			assert.Equal(t, tc.expectedDiffReport.DifferentTestCasesResults, diffReport.DifferentTestCasesResults)

diff --git a/cmd/tnf/claim/show/failures/failures_test.go b/cmd/tnf/claim/show/failures/failures_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/test-network-function/cnf-certification-test/cmd/tnf/pkg/claim"
-	"gotest.tools/v3/assert"
 )
 
 func TestParseTargetTestSuitesFlag(t *testing.T) {
@@ -50,7 +50,7 @@ func TestParseTargetTestSuitesFlag(t *testing.T) {
 	for _, tc := range testCases {
 		testSuitesFlag = tc.flag
 		parsedTestSuites := parseTargetTestSuitesFlag()
-		assert.DeepEqual(t, tc.expectedTestSuites, parsedTestSuites)
+		assert.Equal(t, tc.expectedTestSuites, parsedTestSuites)
 	}
 }
 
@@ -265,7 +265,7 @@ func TestGetNonCompliantObjectsFromFailureReason(t *testing.T) {
 			assert.Equal(t, tc.expectedError, err.Error())
 		}
 
-		assert.DeepEqual(t, tc.expectedNonCompliantObjects, nonCompliantObjects)
+		assert.Equal(t, tc.expectedNonCompliantObjects, nonCompliantObjects)
 	}
 }
 
@@ -376,7 +376,7 @@ func TestGetFailedTestCasesByTestSuite(t *testing.T) {
 
 	for _, tc := range testCases {
 		claimScheme, err := claim.Parse(tc.claimFilePath)
-		assert.NilError(t, err)
+		assert.Nil(t, err)
 
 		// Order test case results by test suite, using a helper map.
 		resultsByTestSuite := map[string][]*claim.TestCaseResult{}
@@ -393,6 +393,6 @@ func TestGetFailedTestCasesByTestSuite(t *testing.T) {
 			map[string]bool{tc.targetTestSuite: true},
 		)
 		fmt.Printf("%#v\n\n", testSuites)
-		assert.DeepEqual(t, tc.expectedFailedTestSuites, testSuites)
+		assert.Equal(t, tc.expectedFailedTestSuites, testSuites)
 	}
 }
diff --git a/cmd/tnf/pkg/claim/claim_test.go b/cmd/tnf/pkg/claim/claim_test.go
@@ -3,7 +3,7 @@ package claim
 import (
 	"testing"
 
-	"gotest.tools/v3/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIsClaimFormatVersionSupported(t *testing.T) {