chore: update implementation

ldez · ldez · commit 34c3328f8d99 · 2025-03-13T13:41:12.000+01:00
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -3370,6 +3370,7 @@
                   "contains",
                   "empty",
                   "encoded-compare",
+                  "equal-values",
                   "error-is-as",
                   "error-nil",
                   "expected-actual",
@@ -3384,6 +3385,7 @@
                   "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-method-signature",
                   "suite-subtest-run",
                   "suite-thelper",
                   "useless-assert"
@@ -3396,6 +3398,7 @@
                 "contains",
                 "empty",
                 "encoded-compare",
+                "equal-values",
                 "error-is-as",
                 "error-nil",
                 "expected-actual",
@@ -3410,6 +3413,7 @@
                 "suite-broken-parallel",
                 "suite-dont-use-pkg",
                 "suite-extra-assert-call",
+                "suite-method-signature",
                 "suite-subtest-run",
                 "useless-assert"
               ]
@@ -3425,6 +3429,7 @@
                   "contains",
                   "empty",
                   "encoded-compare",
+                  "equal-values",
                   "error-is-as",
                   "error-nil",
                   "expected-actual",
@@ -3439,6 +3444,7 @@
                   "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-method-signature",
                   "suite-subtest-run",
                   "suite-thelper",
                   "useless-assert"
@@ -3519,6 +3525,11 @@
                   "default": "remove"
                 }
               }
+            },
+            "require-string-msg": {
+              "description": "To require that the first element of msgAndArgs (msg) has a string type.",
+              "type": "boolean",
+              "default": true
             }
           }
         },
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -849,6 +849,7 @@ type TestifylintSettings struct {
 	Formatter            TestifylintFormatter            `mapstructure:"formatter"`
 	GoRequire            TestifylintGoRequire            `mapstructure:"go-require"`
 	RequireError         TestifylintRequireError         `mapstructure:"require-error"`
+	RequireStringMsg     bool                            `mapstructure:"require-string-msg"`
 	SuiteExtraAssertCall TestifylintSuiteExtraAssertCall `mapstructure:"suite-extra-assert-call"`
 }
 
@@ -863,6 +864,7 @@ type TestifylintExpectedActual struct {
 type TestifylintFormatter struct {
 	CheckFormatString *bool `mapstructure:"check-format-string"`
 	RequireFFuncs     bool  `mapstructure:"require-f-funcs"`
+	RequireStringMsg  bool  `mapstructure:"require-string-msg"`
 }
 
 type TestifylintGoRequire struct {
diff --git a/pkg/golinters/testifylint/testdata/fix/in/testifylint.go b/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"
diff --git a/pkg/golinters/testifylint/testdata/fix/out/testifylint.go b/pkg/golinters/testifylint/testdata/fix/out/testifylint.go
@@ -2,7 +2,6 @@
 package testdata
 
 import (
-	"fmt"
 	"io"
 	"testing"
 
@@ -30,6 +29,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)
diff --git a/pkg/golinters/testifylint/testdata/testifylint_cgo.go b/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"
diff --git a/pkg/golinters/testifylint/testdata/testifylint_formatter_dont_require_string_msg.go b/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"
+}
diff --git a/pkg/golinters/testifylint/testdata/testifylint_formatter_dont_require_string_msg.yml b/pkg/golinters/testifylint/testdata/testifylint_formatter_dont_require_string_msg.yml
@@ -0,0 +1,12 @@
+version: "2"
+
+linters:
+  settings:
+    testifylint:
+      disable-all: true
+      enable:
+        - formatter
+      formatter:
+        check-format-string: false
+        require-f-funcs: false
+        require-string-msg: false
diff --git a/pkg/golinters/testifylint/testdata/testifylint_formatter_only.go b/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"
 }
diff --git a/pkg/golinters/testifylint/testdata/testifylint_formatter_only.yml b/pkg/golinters/testifylint/testdata/testifylint_formatter_only.yml
@@ -9,3 +9,4 @@ linters:
       formatter:
         check-format-string: false
         require-f-funcs: true
+        require-string-msg: true
diff --git a/pkg/golinters/testifylint/testifylint.go b/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 {
diff --git a/test/testshared/runner.go b/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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -849,6 +849,7 @@ type TestifylintSettings struct {`
`849`	`849`	Formatter TestifylintFormatter `mapstructure:"formatter"`
`850`	`850`	GoRequire TestifylintGoRequire `mapstructure:"go-require"`
`851`	`851`	RequireError TestifylintRequireError `mapstructure:"require-error"`
	`852`	+ RequireStringMsg bool `mapstructure:"require-string-msg"`
`852`	`853`	SuiteExtraAssertCall TestifylintSuiteExtraAssertCall `mapstructure:"suite-extra-assert-call"`
`853`	`854`	`}`
`854`	`855`
`@@ -863,6 +864,7 @@ type TestifylintExpectedActual struct {`
`863`	`864`	`type TestifylintFormatter struct {`
`864`	`865`	CheckFormatString *bool `mapstructure:"check-format-string"`
`865`	`866`	RequireFFuncs bool `mapstructure:"require-f-funcs"`
	`867`	+ RequireStringMsg bool `mapstructure:"require-string-msg"`
`866`	`868`	`}`
`867`	`869`
`868`	`870`	`type TestifylintGoRequire struct {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ func New(settings config.TestifylintSettings) goanalysis.Linter {`
`19`	`19`
`20`	`20`	`"bool-compare.ignore-custom-types": settings.BoolCompare.IgnoreCustomTypes,`
`21`	`21`	`"formatter.require-f-funcs": settings.Formatter.RequireFFuncs,`
	`22`	`+ "formatter.require-string-msg": settings.Formatter.RequireStringMsg,`
`22`	`23`	`"go-require.ignore-http-handlers": settings.GoRequire.IgnoreHTTPHandlers,`
`23`	`24`	`}`
`24`	`25`	`if len(settings.EnabledCheckers) > 0 {`