tests: fix

ldez · ldez · commit 89e8fa580a03 · 2024-12-22T00:53:22.000+01:00
diff --git a/pkg/golinters/gci/testdata/gci.go b/pkg/golinters/gci/testdata/gci.go
@@ -2,7 +2,7 @@
 //golangcitest:config_path testdata/gci.yml
 package testdata
 
-// want +1 "Invalid import order"
+// want +1 "File is not properly formatted"
 import (
 	"golang.org/x/tools/go/analysis"
 	"github.com/golangci/golangci-lint/pkg/config"
diff --git a/pkg/golinters/gci/testdata/gci_cgo.go b/pkg/golinters/gci/testdata/gci_cgo.go
@@ -16,7 +16,7 @@ package testdata
 */
 import "C"
 
-// want +1 "Invalid import order"
+// want +1 "File is not properly formatted"
 import (
 	"golang.org/x/tools/go/analysis"
 	"github.com/golangci/golangci-lint/pkg/config"
diff --git a/pkg/golinters/gofmt/testdata/gofmt.go b/pkg/golinters/gofmt/testdata/gofmt.go
@@ -5,5 +5,5 @@ import "fmt"
 
 func GofmtNotSimplified() {
 	var x []string
-	fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`"
+	fmt.Print(x[1:len(x)]) // want "File is not properly formatted"
 }
diff --git a/pkg/golinters/gofmt/testdata/gofmt_cgo.go b/pkg/golinters/gofmt/testdata/gofmt_cgo.go
@@ -24,5 +24,5 @@ func _() {
 
 func GofmtNotSimplified() {
 	var x []string
-	fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`"
+	fmt.Print(x[1:len(x)]) // want "File is not properly formatted"
 }
diff --git a/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go b/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go
@@ -9,5 +9,5 @@ func GofmtNotSimplifiedOk() {
 	fmt.Print(x[1:len(x)])
 }
 
-func GofmtBadFormat(){  // want "^File is not `gofmt`-ed"
+func GofmtBadFormat(){  // want "File is not properly formatted"
 }
diff --git a/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go b/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go
@@ -11,7 +11,7 @@ func GofmtRewriteRule() {
 	vals = append(vals, 2)
 	vals = append(vals, 3)
 
-	slice := vals[1:len(vals)] // want "^File is not `gofmt`-ed"
+	slice := vals[1:len(vals)] // want "File is not properly formatted"
 
 	fmt.Println(slice)
 }
diff --git a/pkg/golinters/gofumpt/testdata/gofumpt.go b/pkg/golinters/gofumpt/testdata/gofumpt.go
@@ -4,5 +4,5 @@ package testdata
 import "fmt"
 
 func GofumptNewLine() {
-	fmt.Println( "foo" ) // want "File is not `gofumpt`-ed"
+	fmt.Println( "foo" ) // want "File is not properly formatted"
 }
diff --git a/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go b/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go
@@ -23,5 +23,5 @@ func _() {
 }
 
 func GofumptNewLine() {
-	fmt.Println( "foo" ) // want "File is not `gofumpt`-ed"
+	fmt.Println( "foo" ) // want "File is not properly formatted"
 }
diff --git a/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go b/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go
@@ -4,6 +4,6 @@ package testdata
 
 import "fmt"
 
-func GofmtNotExtra(bar string, baz string) { // want "File is not `gofumpt`-ed with `-extra`"
+func GofmtNotExtra(bar string, baz string) { // want "File is not properly formatted"
 	fmt.Print("foo")
 }
diff --git a/pkg/golinters/goimports/testdata/goimports.go b/pkg/golinters/goimports/testdata/goimports.go
@@ -2,7 +2,7 @@
 package testdata
 
 import (
-	"fmt" // want "File is not `goimports`-ed"
+	"fmt" // want "File is not properly formatted"
 	"github.com/golangci/golangci-lint/pkg/config"
 )
 
diff --git a/pkg/golinters/goimports/testdata/goimports_cgo.go b/pkg/golinters/goimports/testdata/goimports_cgo.go
@@ -13,7 +13,7 @@ import "C"
 
 import (
 	"fmt"
-	"unsafe" // want "File is not `goimports`-ed"
+	"unsafe" // want "File is not properly formatted"
 	"github.com/golangci/golangci-lint/pkg/config"
 )
 
diff --git a/pkg/golinters/goimports/testdata/goimports_local.go b/pkg/golinters/goimports/testdata/goimports_local.go
@@ -5,7 +5,7 @@ package testdata
 import (
 	"fmt"
 
-	"github.com/golangci/golangci-lint/pkg/config" // want "File is not `goimports`-ed with -local github.com/golangci/golangci-lint"
+	"github.com/golangci/golangci-lint/pkg/config" // want "File is not properly formatted"
 	"golang.org/x/tools/go/analysis"
 )
 
diff --git a/test/run_test.go b/test/run_test.go
@@ -133,7 +133,7 @@ func TestCgoWithIssues(t *testing.T) {
 			desc:     "gofmt",
 			args:     []string{"--no-config", "--disable-all", "-Egofmt"},
 			dir:      "cgo_with_issues",
-			expected: "File is not `gofmt`-ed with `-s` (gofmt)",
+			expected: "File is not properly formatted (gofmt)",
 		},
 		{
 			desc:     "revive",
@@ -186,7 +186,7 @@ func TestLineDirective(t *testing.T) {
 				"--disable-all",
 			},
 			targetPath: "linedirective",
-			expected:   "File is not `gofmt`-ed with `-s` (gofmt)",
+			expected:   "File is not properly formatted (gofmt)",
 		},
 		{
 			desc: "goimports",
@@ -195,7 +195,7 @@ func TestLineDirective(t *testing.T) {
 				"--disable-all",
 			},
 			targetPath: "linedirective",
-			expected:   "File is not `goimports`-ed (goimports)",
+			expected:   "File is not properly formatted (goimports)",
 		},
 		{
 			desc: "gomodguard",

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ import "fmt"`
`5`	`5`
`6`	`6`	`func GofmtNotSimplified() {`
`7`	`7`	`var x []string`
`8`		- fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`"
	`8`	`+ fmt.Print(x[1:len(x)]) // want "File is not properly formatted"`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ func _() {`
`24`	`24`
`25`	`25`	`func GofmtNotSimplified() {`
`26`	`26`	`var x []string`
`27`		- fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`"
	`27`	`+ fmt.Print(x[1:len(x)]) // want "File is not properly formatted"`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ func GofmtNotSimplifiedOk() {`
`9`	`9`	`fmt.Print(x[1:len(x)])`
`10`	`10`	`}`
`11`	`11`
`12`		-func GofmtBadFormat(){ // want "^File is not `gofmt`-ed"
	`12`	`+func GofmtBadFormat(){ // want "File is not properly formatted"`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ func GofmtRewriteRule() {`
`11`	`11`	`vals = append(vals, 2)`
`12`	`12`	`vals = append(vals, 3)`
`13`	`13`
`14`		- slice := vals[1:len(vals)] // want "^File is not `gofmt`-ed"
	`14`	`+ slice := vals[1:len(vals)] // want "File is not properly formatted"`
`15`	`15`
`16`	`16`	`fmt.Println(slice)`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ package testdata`
`4`	`4`	`import "fmt"`
`5`	`5`
`6`	`6`	`func GofumptNewLine() {`
`7`		- fmt.Println( "foo" ) // want "File is not `gofumpt`-ed"
	`7`	`+ fmt.Println( "foo" ) // want "File is not properly formatted"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ func _() {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func GofumptNewLine() {`
`26`		- fmt.Println( "foo" ) // want "File is not `gofumpt`-ed"
	`26`	`+ fmt.Println( "foo" ) // want "File is not properly formatted"`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ package testdata`
`4`	`4`
`5`	`5`	`import "fmt"`
`6`	`6`
`7`		-func GofmtNotExtra(bar string, baz string) { // want "File is not `gofumpt`-ed with `-extra`"
	`7`	`+func GofmtNotExtra(bar string, baz string) { // want "File is not properly formatted"`
`8`	`8`	`fmt.Print("foo")`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`package testdata`
`3`	`3`
`4`	`4`	`import (`
`5`		- "fmt" // want "File is not `goimports`-ed"
	`5`	`+ "fmt" // want "File is not properly formatted"`
`6`	`6`	`"github.com/golangci/golangci-lint/pkg/config"`
`7`	`7`	`)`
`8`	`8`