build(deps): bump github.com/Antonboom/testifylint from 1.5.2 to 1.6.0

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/Abirdcfly/dupword v0.1.3
 	github.com/Antonboom/errname v1.0.0
 	github.com/Antonboom/nilnil v1.0.1
-	github.com/Antonboom/testifylint v1.5.2
+	github.com/Antonboom/testifylint v1.6.0
 	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c
 	github.com/Crocmagnon/fatcontext v0.7.1
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24

jsonschema/golangci.next.jsonschema.json

@@ -3198,6 +3198,7 @@
                   "contains",
                   "empty",
                   "encoded-compare",
+                  "equal-values",
                   "error-is-as",
                   "error-nil",
                   "expected-actual",
@@ -3212,6 +3213,7 @@
                   "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-method-signature",
                   "suite-subtest-run",
                   "suite-thelper",
                   "useless-assert"
@@ -3224,6 +3226,7 @@
                 "contains",
                 "empty",
                 "encoded-compare",
+                "equal-values",
                 "error-is-as",
                 "error-nil",
                 "expected-actual",
@@ -3238,6 +3241,7 @@
                 "suite-broken-parallel",
                 "suite-dont-use-pkg",
                 "suite-extra-assert-call",
+                "suite-method-signature",
                 "suite-subtest-run",
                 "useless-assert"
               ]
@@ -3253,6 +3257,7 @@
                   "contains",
                   "empty",
                   "encoded-compare",
+                  "equal-values",
                   "error-is-as",
                   "error-nil",
                   "expected-actual",
@@ -3267,8 +3272,8 @@
                   "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-method-signature",
                   "suite-subtest-run",
-                  "suite-thelper",
                   "useless-assert"
                 ],
                 "default": [
@@ -3311,6 +3316,11 @@
                   "description": "To require f-assertions (e.g. assert.Equalf) if format string is used, even if there are no variable-length variables.",
                   "type": "boolean",
                   "default": false
+                },
+                "require-string-msg": {
+                  "description": "To require that the first element of msgAndArgs (msg) has a string type.",
+                  "type": "boolean",
+                  "default": true
                 }
               }
             },

pkg/config/linters_settings.go

@@ -957,6 +957,7 @@ type TestifylintSettings struct {
 	Formatter struct {
 		CheckFormatString *bool `mapstructure:"check-format-string"`
 		RequireFFuncs     bool  `mapstructure:"require-f-funcs"`
+		RequireStringMsg  bool  `mapstructure:"require-string-msg"`
 	} `mapstructure:"formatter"`
 
 	GoRequire struct {

pkg/golinters/testifylint/testdata/fix/in/testifylint.go

@@ -30,7 +30,8 @@ func TestTestifylint(t *testing.T) {
 	assert.Nil(t, err)                      // want "error-nil: use assert\\.NoError"
 	assert.Equal(t, resultInt, 42)          // want "expected-actual: need to reverse actual and expected values"
 	assert.Equal(t, resultFloat, 42.42)     // want "float-compare: use assert\\.InEpsilon \\(or InDelta\\)"
-	assert.Equal(t, len(arr), 10)           // want "len: use assert\\.Len"
+	assert.Equal(t, len(arr), 10)           // want "expected-actual: need to reverse actual and expected values"
+	assert.Equal(t, 10, len(arr))           // want "len: use assert\\.Len"
 
 	assert.True(t, predicate)
 	assert.Equal(t, resultInt, 1) // want "expected-actual: need to reverse actual and expected values"

pkg/golinters/testifylint/testdata/fix/out/testifylint.go

@@ -30,6 +30,7 @@ func TestTestifylint(t *testing.T) {
 	assert.NoError(t, err)                 // want "error-nil: use assert\\.NoError"
 	assert.Equal(t, 42, resultInt)         // want "expected-actual: need to reverse actual and expected values"
 	assert.Equal(t, resultFloat, 42.42)    // want "float-compare: use assert\\.InEpsilon \\(or InDelta\\)"
+	assert.Equal(t, 10, len(arr))          // want "expected-actual: need to reverse actual and expected values"
 	assert.Len(t, arr, 10)                 // want "len: use assert\\.Len"
 
 	assert.True(t, predicate)

pkg/golinters/testifylint/testdata/testifylint.go

@@ -30,7 +30,8 @@ func TestTestifylint(t *testing.T) {
 	assert.Nil(t, err)                      // want "error-nil: use assert\\.NoError"
 	assert.Equal(t, resultInt, 42)          // want "expected-actual: need to reverse actual and expected values"
 	assert.Equal(t, resultFloat, 42.42)     // want "float-compare: use assert\\.InEpsilon \\(or InDelta\\)"
-	assert.Equal(t, len(arr), 10)           // want "len: use assert\\.Len"
+	assert.Equal(t, len(arr), 10)           // want "expected-actual: need to reverse actual and expected values"
+	assert.Equal(t, 10, len(arr))           // want "len: use assert\\.Len"
 
 	assert.True(t, predicate)
 	assert.Equal(t, resultInt, 1) // want "expected-actual: need to reverse actual and expected values"

pkg/golinters/testifylint/testdata/testifylint_cgo.go

@@ -46,7 +46,8 @@ func TestTestifylint(t *testing.T) {
 	assert.Nil(t, err)                      // want "error-nil: use assert\\.NoError"
 	assert.Equal(t, resultInt, 42)          // want "expected-actual: need to reverse actual and expected values"
 	assert.Equal(t, resultFloat, 42.42)     // want "float-compare: use assert\\.InEpsilon \\(or InDelta\\)"
-	assert.Equal(t, len(arr), 10)           // want "len: use assert\\.Len"
+	assert.Equal(t, len(arr), 10)           // want "expected-actual: need to reverse actual and expected values"
+	assert.Equal(t, 10, len(arr))           // want "len: use assert\\.Len"
 
 	assert.True(t, predicate)
 	assert.Equal(t, resultInt, 1) // want "expected-actual: need to reverse actual and expected values"

pkg/golinters/testifylint/testdata/testifylint_formatter_dont_require_string_msg.go

@@ -0,0 +1,16 @@
+//golangcitest:args -Etestifylint
+//golangcitest:config_path testdata/testifylint_formatter_dont_require_string_msg.yml
+package testdata
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTestifylint(t *testing.T) {
+	var b bool
+	assert.True(t, b, b)
+	assert.True(t, b, "msg %v", 1)
+	assert.True(t, b, b, 1) // want "formatter: using msgAndArgs with non-string first element \\(msg\\) causes panic"
+}

pkg/golinters/testifylint/testdata/testifylint_formatter_dont_require_string_msg.yml

@@ -0,0 +1,9 @@
+linters-settings:
+  testifylint:
+    disable-all: true
+    enable:
+      - formatter
+    formatter:
+      check-format-string: false
+      require-f-funcs: false
+      require-string-msg: false

pkg/golinters/testifylint/testdata/testifylint_formatter_only.go

@@ -12,8 +12,12 @@ import (
 func TestTestifylint(t *testing.T) {
 	var err error
 	var args []any
+	var b bool
 	assert.Error(t, err, "Parse(%v) should fail.", args) // want "formatter: use assert\\.Errorf$"
 
 	assert.Equal(t, 1, 2, fmt.Sprintf("msg")) // want "formatter: remove unnecessary fmt\\.Sprintf and use assert\\.Equalf"
 	assert.DirExistsf(t, "", "msg with arg", 42)
+
+	assert.True(t, b, b)    // want "formatter: do not use non-string value as first element \\(msg\\) of msgAndArgs"
+	assert.True(t, b, b, 1) // want "formatter: using msgAndArgs with non-string first element \\(msg\\) causes panic"
 }

pkg/golinters/testifylint/testdata/testifylint_formatter_only.yml

@@ -6,3 +6,4 @@ linters-settings:
     formatter:
       check-format-string: false
       require-f-funcs: true
+      require-string-msg: true

pkg/golinters/testifylint/testifylint.go

@@ -19,6 +19,7 @@ func New(settings *config.TestifylintSettings) *goanalysis.Linter {
 
 			"bool-compare.ignore-custom-types": settings.BoolCompare.IgnoreCustomTypes,
 			"formatter.require-f-funcs":        settings.Formatter.RequireFFuncs,
+			"formatter.require-string-msg":     settings.Formatter.RequireStringMsg,
 			"go-require.ignore-http-handlers":  settings.GoRequire.IgnoreHTTPHandlers,
 		}
 		if len(settings.EnabledCheckers) > 0 {

test/testshared/runner.go

@@ -279,7 +279,7 @@ type RunnerResult struct {
 func (r *RunnerResult) ExpectNoIssues() {
 	r.tb.Helper()
 
-	assert.Equal(r.tb, "", r.output, "exit code is %d", r.exitCode)
+	assert.Empty(r.tb, r.output, "exit code is %d", r.exitCode)
 	assert.Equal(r.tb, exitcodes.Success, r.exitCode, "output is %s", r.output)
 }