Merge pull request #108 from mmorel-35/testifylint

chore: enable testifylint

Author: ahrtr

.golangci.yaml

@@ -25,6 +25,7 @@ linters:
     - revive
     - staticcheck
     - stylecheck
+    - testifylint
     - unconvert
     - unparam
     - unused
@@ -37,6 +38,9 @@ linters-settings: # please keep this alphabetized
   stylecheck:
     checks:
       - "ST1019"  # Importing the same package multiple times.
-
+  testifylint:
+    enable-all: true
+    formatter:
+      require-f-funcs: true
 run:
   timeout: 30m

code/binding_test.go

@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestBindingWrite(t *testing.T) {
@@ -27,13 +28,12 @@ func TestBindingWrite(t *testing.T) {
 	expected := "// GENERATED BY GOFAIL. DO NOT EDIT.\n\npackage testing\n\nimport \"go.etcd.io/gofail/runtime\"\n\nvar __fp_Test *runtime.Failpoint = runtime.NewFailpoint(\"Test\")\n"
 
 	fp, err := newFailpoint(comment)
-	assert.Nilf(t, err, "failed to create failpoint from comment: %s", comment)
+	require.NoErrorf(t, err, "failed to create failpoint from comment: %s", comment)
 
 	b := NewBinding(pkg, []*Failpoint{fp})
 
 	var buf bytes.Buffer
-	err = b.Write(&buf)
-	assert.Nil(t, err)
+	require.NoError(t, b.Write(&buf))
 
 	got := buf.String()
 	assert.Equal(t, expected, got)

code/rewrite_test.go

@@ -18,6 +18,8 @@ import (
 	"bytes"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 var examples = []struct {
@@ -97,19 +99,11 @@ func TestToFailpoint(t *testing.T) {
 		dst := bytes.NewBuffer(make([]byte, 0, 1024))
 		src := strings.NewReader(ex.code)
 		fps, err := ToFailpoints(dst, src)
-		if err != nil {
-			t.Fatalf("%d: %v", i, err)
-		}
-		if len(fps) != ex.wfps {
-			t.Fatalf("%d: got %d failpoints but expected %d", i, len(fps), ex.wfps)
-		}
+		require.NoErrorf(t, err, "%d: %v", i, err)
+		require.Equalf(t, len(fps), ex.wfps, "%d: got %d failpoints but expected %d", i, len(fps), ex.wfps)
 		dstOut := dst.String()
-		if len(strings.Split(dstOut, "\n")) != len(strings.Split(ex.code, "\n")) {
-			t.Fatalf("%d: bad line count %q", i, dstOut)
-		}
-		if ex.expectedGeneratedCode != dstOut {
-			t.Fatalf("expected generated code and actual generated code differs:\nExpected:\n%q\n\nActual:\n%q", ex.expectedGeneratedCode, dstOut)
-		}
+		require.Lenf(t, strings.Split(ex.code, "\n"), len(strings.Split(dstOut, "\n")), "%d: bad line count %q", i, dstOut)
+		require.Equalf(t, ex.expectedGeneratedCode, dstOut, "expected generated code and actual generated code differs:\nExpected:\n%q\n\nActual:\n%q", ex.expectedGeneratedCode, dstOut)
 	}
 }
 
@@ -118,23 +112,15 @@ func TestToComment(t *testing.T) {
 		dst := bytes.NewBuffer(make([]byte, 0, 1024))
 		src := strings.NewReader(ex.code)
 		_, err := ToFailpoints(dst, src)
-		if err != nil {
-			t.Fatalf("%d: %v", i, err)
-		}
+		require.NoErrorf(t, err, "%d: %v", i, err)
 
 		src = strings.NewReader(dst.String())
 		dst.Reset()
 		fps, err := ToComments(dst, src)
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
+		require.NoErrorf(t, err, "unexpected error: %v", err)
 		plainCode := dst.String()
 
-		if plainCode != ex.code {
-			t.Fatalf("%d: non-preserving ToComments(); got %q, want %q", i, plainCode, ex.code)
-		}
-		if len(fps) != ex.wfps {
-			t.Fatalf("%d: got %d failpoints but expected %d", i, len(fps), ex.wfps)
-		}
+		require.Equalf(t, plainCode, ex.code, "%d: non-preserving ToComments(); got %q, want %q", i, plainCode, ex.code)
+		require.Equalf(t, len(fps), ex.wfps, "%d: got %d failpoints but expected %d", i, len(fps), ex.wfps)
 	}
 }

runtime/failpoint_test.go

@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestFailpointCreateAndAcquire(t *testing.T) {
@@ -31,7 +32,7 @@ func TestFailpointCreateAndAcquire(t *testing.T) {
 	assert.Equal(t, envTerms[name], fp1.t.desc)
 
 	v, err := fp1.Acquire()
-	assert.Nil(t, err)
+	require.NoError(t, err)
 
 	intv := v.(int)
 	assert.Equal(t, 1, intv)

runtime/runtime_test.go

@@ -111,9 +111,9 @@ func TestParseFailpoints(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			fpsMap, err := parseFailpoints(tc.fps)
 
-			require.Equal(t, tc.expectErr, err != nil, "Unexpected result, tc.expectErr: %t, err: %v", tc.expectedFpsMap, err)
+			require.Equalf(t, tc.expectErr, err != nil, "Unexpected result, tc.expectErr: %t, err: %v", tc.expectedFpsMap, err)
 
-			require.Equal(t, tc.expectedFpsMap, fpsMap, "Unexpected result, expected: %v, got: %v", tc.expectedFpsMap, fpsMap)
+			require.Equalf(t, tc.expectedFpsMap, fpsMap, "Unexpected result, expected: %v, got: %v", tc.expectedFpsMap, fpsMap)
 		})
 	}
 }

runtime/terms_test.go

@@ -17,6 +17,9 @@ package runtime
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTermsString(t *testing.T) {
@@ -31,17 +34,13 @@ func TestTermsString(t *testing.T) {
 	}
 	for _, tt := range tests {
 		ter, err := newTerms("test", tt.desc)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 		for _, w := range tt.weval {
 			v := ter.eval()
 			if v == nil && w == "" {
 				continue
 			}
-			if v.(string) != w {
-				t.Fatalf("got %q, expected %q", v, w)
-			}
+			require.Equalf(t, v.(string), w, "got %q, expected %q", v, w)
 		}
 	}
 }
@@ -59,16 +58,12 @@ func TestTermsTypes(t *testing.T) {
 	}
 	for _, tt := range tests {
 		ter, err := newTerms("test", tt.desc)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 		v := ter.eval()
 		if v == nil && tt.weval == nil {
 			continue
 		}
-		if !reflect.DeepEqual(v, tt.weval) {
-			t.Fatalf("got %v, expected %v", v, tt.weval)
-		}
+		require.Truef(t, reflect.DeepEqual(v, tt.weval), "got %v, expected %v", v, tt.weval)
 	}
 }
 
@@ -100,15 +95,11 @@ func TestTermsCounter(t *testing.T) {
 	}
 	for _, tt := range tests {
 		ter, err := newTerms("test", tt.failpointTerm)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 		for i := 0; i < tt.runAfterEnabling; i++ {
 			_ = ter.eval()
 		}
 
-		if ter.counter != tt.wantCount {
-			t.Errorf("counter is not properly incremented, got: %d, want: %d", ter.counter, tt.wantCount)
-		}
+		assert.Equalf(t, tt.wantCount, ter.counter, "counter is not properly incremented, got: %d, want: %d", ter.counter, tt.wantCount)
 	}
 }