enable testifylint linter

.golangci.yml

@@ -71,6 +71,10 @@ linters-settings:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
     local-prefixes: github.com/daixiang0/gci
+  testifylint:
+    disable:
+    - useless-assert
+    enable-all: true
 
 linters:
   fast: false
@@ -79,6 +83,7 @@ linters:
   - gofumpt
   - goimports
   - gci
+  - testifylint
   disable-all: true
 
 issues:

pkg/analyzer/diff_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/daixiang0/gci/pkg/analyzer"
@@ -113,14 +114,14 @@ import (
 		t.Run(tt.name, func(t *testing.T) {
 			fset := token.NewFileSet()
 			f, err := parser.ParseFile(fset, "analyzer.go", tt.unformattedFile, 0)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			actualFix, err := analyzer.GetSuggestedFix(fset.File(f.Pos()), []byte(tt.unformattedFile), []byte(formattedFile))
 			if tt.expectedErr != "" {
 				assert.ErrorContains(t, err, tt.expectedErr)
 				return
 			}
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tt.expectedFix, actualFix)
 		})
 	}

pkg/analyzer/errors_test.go

@@ -1,12 +1,11 @@
 package analyzer
 
 import (
-	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestInvalidNumberOfFiles(t *testing.T) {
-	assert.True(t, errors.Is(InvalidNumberOfFilesInAnalysis{1, 2}, InvalidNumberOfFilesInAnalysis{}))
+	assert.ErrorIs(t, InvalidNumberOfFilesInAnalysis{1, 2}, InvalidNumberOfFilesInAnalysis{})
 }

pkg/config/config_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/daixiang0/gci/pkg/section"
 )
@@ -14,7 +15,7 @@ func TestParseOrder(t *testing.T) {
 		SectionStrings: []string{"default", "prefix(github/daixiang0/gci)", "prefix(github/daixiang0/gai)"},
 	}
 	gciCfg, err := cfg.Parse()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, section.SectionList{section.Default{}, section.Custom{Prefix: "github/daixiang0/gai"}, section.Custom{Prefix: "github/daixiang0/gci"}}, gciCfg.Sections)
 }
 
@@ -26,7 +27,7 @@ func TestParseCustomOrder(t *testing.T) {
 		},
 	}
 	gciCfg, err := cfg.Parse()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, section.SectionList{section.Default{}, section.Custom{Prefix: "github/daixiang0/gci"}, section.Custom{Prefix: "github/daixiang0/gai"}}, gciCfg.Sections)
 }
 
@@ -39,6 +40,6 @@ func TestParseNoLexOrder(t *testing.T) {
 	}
 
 	gciCfg, err := cfg.Parse()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, section.SectionList{section.Default{}, section.Custom{Prefix: "github/daixiang0/gci"}, section.Custom{Prefix: "github/daixiang0/gai"}}, gciCfg.Sections)
 }

pkg/gci/gci_test.go

@@ -33,7 +33,7 @@ func TestRun(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, testCases[i].in, string(old))
 			assert.Equal(t, testCases[i].out, string(new))
 		})

pkg/section/errors_test.go

@@ -1,25 +1,24 @@
 package section
 
 import (
-	"errors"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestErrorMatching(t *testing.T) {
-	assert.True(t, errors.Is(MissingParameterClosingBracketsError, MissingParameterClosingBracketsError))
-	assert.True(t, errors.Is(MoreThanOneOpeningQuotesError, MoreThanOneOpeningQuotesError))
-	assert.True(t, errors.Is(SectionTypeDoesNotAcceptParametersError, SectionTypeDoesNotAcceptParametersError))
-	assert.True(t, errors.Is(SectionTypeDoesNotAcceptPrefixError, SectionTypeDoesNotAcceptPrefixError))
-	assert.True(t, errors.Is(SectionTypeDoesNotAcceptSuffixError, SectionTypeDoesNotAcceptSuffixError))
+	require.ErrorIs(t, MissingParameterClosingBracketsError, MissingParameterClosingBracketsError)
+	require.ErrorIs(t, MoreThanOneOpeningQuotesError, MoreThanOneOpeningQuotesError)
+	require.ErrorIs(t, SectionTypeDoesNotAcceptParametersError, SectionTypeDoesNotAcceptParametersError)
+	require.ErrorIs(t, SectionTypeDoesNotAcceptPrefixError, SectionTypeDoesNotAcceptPrefixError)
+	require.ErrorIs(t, SectionTypeDoesNotAcceptSuffixError, SectionTypeDoesNotAcceptSuffixError)
 }
 
 func TestErrorClass(t *testing.T) {
 	subError := MissingParameterClosingBracketsError
 	errorGroup := SectionParsingError{subError}
-	assert.True(t, errors.Is(errorGroup, SectionParsingError{}))
-	assert.True(t, errors.Is(errorGroup, subError))
-	assert.True(t, errors.Is(errorGroup.Wrap("x"), SectionParsingError{}))
-	assert.True(t, errors.Is(errorGroup.Wrap("x"), subError))
+	require.ErrorIs(t, errorGroup, SectionParsingError{})
+	require.ErrorIs(t, errorGroup, subError)
+	require.ErrorIs(t, errorGroup.Wrap("x"), SectionParsingError{})
+	require.ErrorIs(t, errorGroup.Wrap("x"), subError)
 }