tests: add missing whitespace tests

ldez · ldez · commit f4b2e7a10fee · 2024-12-17T05:08:03.000+01:00
diff --git a/pkg/golinters/whitespace/testdata/whitespace.go b/pkg/golinters/whitespace/testdata/whitespace.go
@@ -4,16 +4,16 @@ package testdata
 
 import "fmt"
 
-func oneLeadingNewline() {
+func oneLeadingNewline() { // want "unnecessary leading newline"
 
 	fmt.Println("Hello world")
 }
 
-func oneNewlineAtBothEnds() {
+func oneNewlineAtBothEnds() { // want "unnecessary leading newline"
 
 	fmt.Println("Hello world")
 
-}
+} // want "unnecessary trailing newline"
 
 func noNewlineFunc() {
 }
@@ -41,36 +41,36 @@ func oneLeadingNewlineWithCommentFunc() {
 	// some comment
 }
 
-func twoLeadingNewlines() {
+func twoLeadingNewlines() { // want "unnecessary leading newline"
 
 
 	fmt.Println("Hello world")
 }
 
 func multiFuncFunc(a int,
-	b int) {
+	b int) { // want "multi-line statement should be followed by a newline"
 	fmt.Println("Hello world")
 }
 
 func multiIfFunc() {
 	if 1 == 1 &&
-		2 == 2 {
+		2 == 2 { // want "multi-line statement should be followed by a newline"
 		fmt.Println("Hello multi-line world")
 	}
 
 	if true {
 		if true {
 			if true {
 				if 1 == 1 &&
-					2 == 2 {
+					2 == 2 { // want "multi-line statement should be followed by a newline"
 						fmt.Println("Hello nested multi-line world")
 				}
 			}
 		}
 	}
 }
 
-func notGoFmted() {
+func notGoFmted() { // want "unnecessary leading newline"
 
 
 
@@ -79,4 +79,4 @@ func notGoFmted() {
 
 
 
-}
+} // want "unnecessary trailing newline"
diff --git a/pkg/golinters/whitespace/testdata/whitespace_cgo.go b/pkg/golinters/whitespace/testdata/whitespace_cgo.go
@@ -1,3 +1,7 @@
+//go:build ignore
+
+// TODO(ldez) the linter doesn't support cgo.
+
 //golangcitest:args -Ewhitespace
 //golangcitest:config_path testdata/whitespace.yml
 package testdata
@@ -14,7 +18,6 @@ import "C"
 
 import (
 	"fmt"
-	"strings"
 	"unsafe"
 )
 
@@ -24,16 +27,16 @@ func _() {
 	C.free(unsafe.Pointer(cs))
 }
 
-func oneLeadingNewline() {
+func oneLeadingNewline() { // want "unnecessary leading newline"
 
 	fmt.Println("Hello world")
 }
 
-func oneNewlineAtBothEnds() {
+func oneNewlineAtBothEnds() { // want "unnecessary leading newline"
 
 	fmt.Println("Hello world")
 
-}
+} // want "unnecessary trailing newline"
 
 func noNewlineFunc() {
 }
@@ -61,36 +64,36 @@ func oneLeadingNewlineWithCommentFunc() {
 	// some comment
 }
 
-func twoLeadingNewlines() {
+func twoLeadingNewlines() { // want "unnecessary leading newline"
 
 
 	fmt.Println("Hello world")
 }
 
 func multiFuncFunc(a int,
-	b int) {
+	b int) { // want "multi-line statement should be followed by a newline"
 	fmt.Println("Hello world")
 }
 
 func multiIfFunc() {
 	if 1 == 1 &&
-		2 == 2 {
+		2 == 2 { // want "multi-line statement should be followed by a newline"
 		fmt.Println("Hello multi-line world")
 	}
 
 	if true {
 		if true {
 			if true {
 				if 1 == 1 &&
-					2 == 2 {
+					2 == 2 { // want "multi-line statement should be followed by a newline"
 						fmt.Println("Hello nested multi-line world")
 				}
 			}
 		}
 	}
 }
 
-func notGoFmted() {
+func notGoFmted() { // want "unnecessary leading newline"
 
 
 
@@ -99,4 +102,4 @@ func notGoFmted() {
 
 
 
-}
+} // want "unnecessary trailing newline"
diff --git a/pkg/golinters/whitespace/whitespace_integration_test.go b/pkg/golinters/whitespace/whitespace_integration_test.go
@@ -6,6 +6,10 @@ import (
 	"github.com/golangci/golangci-lint/test/testshared/integration"
 )
 
+func TestFromTestdata(t *testing.T) {
+	integration.RunTestdata(t)
+}
+
 func TestFix(t *testing.T) {
 	integration.RunFix(t)
 }

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,16 @@ package testdata`
`4`	`4`
`5`	`5`	`import "fmt"`
`6`	`6`
`7`		`-func oneLeadingNewline() {`
	`7`	`+func oneLeadingNewline() { // want "unnecessary leading newline"`
`8`	`8`
`9`	`9`	`fmt.Println("Hello world")`
`10`	`10`	`}`
`11`	`11`
`12`		`-func oneNewlineAtBothEnds() {`
	`12`	`+func oneNewlineAtBothEnds() { // want "unnecessary leading newline"`
`13`	`13`
`14`	`14`	`fmt.Println("Hello world")`
`15`	`15`
`16`		`-}`
	`16`	`+} // want "unnecessary trailing newline"`
`17`	`17`
`18`	`18`	`func noNewlineFunc() {`
`19`	`19`	`}`
`@@ -41,36 +41,36 @@ func oneLeadingNewlineWithCommentFunc() {`
`41`	`41`	`// some comment`
`42`	`42`	`}`
`43`	`43`
`44`		`-func twoLeadingNewlines() {`
	`44`	`+func twoLeadingNewlines() { // want "unnecessary leading newline"`
`45`	`45`
`46`	`46`
`47`	`47`	`fmt.Println("Hello world")`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func multiFuncFunc(a int,`
`51`		`- b int) {`
	`51`	`+ b int) { // want "multi-line statement should be followed by a newline"`
`52`	`52`	`fmt.Println("Hello world")`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func multiIfFunc() {`
`56`	`56`	`if 1 == 1 &&`
`57`		`- 2 == 2 {`
	`57`	`+ 2 == 2 { // want "multi-line statement should be followed by a newline"`
`58`	`58`	`fmt.Println("Hello multi-line world")`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if true {`
`62`	`62`	`if true {`
`63`	`63`	`if true {`
`64`	`64`	`if 1 == 1 &&`
`65`		`- 2 == 2 {`
	`65`	`+ 2 == 2 { // want "multi-line statement should be followed by a newline"`
`66`	`66`	`fmt.Println("Hello nested multi-line world")`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`-func notGoFmted() {`
	`73`	`+func notGoFmted() { // want "unnecessary leading newline"`
`74`	`74`
`75`	`75`
`76`	`76`
`@@ -79,4 +79,4 @@ func notGoFmted() {`
`79`	`79`
`80`	`80`
`81`	`81`
`82`		`-}`
	`82`	`+} // want "unnecessary trailing newline"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
	`1`	`+//go:build ignore`
	`2`	`+`
	`3`	`+// TODO(ldez) the linter doesn't support cgo.`
	`4`	`+`
`1`	`5`	`//golangcitest:args -Ewhitespace`
`2`	`6`	`//golangcitest:config_path testdata/whitespace.yml`
`3`	`7`	`package testdata`
`@@ -14,7 +18,6 @@ import "C"`
`14`	`18`
`15`	`19`	`import (`
`16`	`20`	`"fmt"`
`17`		`- "strings"`
`18`	`21`	`"unsafe"`
`19`	`22`	`)`
`20`	`23`
`@@ -24,16 +27,16 @@ func _() {`
`24`	`27`	`C.free(unsafe.Pointer(cs))`
`25`	`28`	`}`
`26`	`29`
`27`		`-func oneLeadingNewline() {`
	`30`	`+func oneLeadingNewline() { // want "unnecessary leading newline"`
`28`	`31`
`29`	`32`	`fmt.Println("Hello world")`
`30`	`33`	`}`
`31`	`34`
`32`		`-func oneNewlineAtBothEnds() {`
	`35`	`+func oneNewlineAtBothEnds() { // want "unnecessary leading newline"`
`33`	`36`
`34`	`37`	`fmt.Println("Hello world")`
`35`	`38`
`36`		`-}`
	`39`	`+} // want "unnecessary trailing newline"`
`37`	`40`
`38`	`41`	`func noNewlineFunc() {`
`39`	`42`	`}`
`@@ -61,36 +64,36 @@ func oneLeadingNewlineWithCommentFunc() {`
`61`	`64`	`// some comment`
`62`	`65`	`}`
`63`	`66`
`64`		`-func twoLeadingNewlines() {`
	`67`	`+func twoLeadingNewlines() { // want "unnecessary leading newline"`
`65`	`68`
`66`	`69`
`67`	`70`	`fmt.Println("Hello world")`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`func multiFuncFunc(a int,`
`71`		`- b int) {`
	`74`	`+ b int) { // want "multi-line statement should be followed by a newline"`
`72`	`75`	`fmt.Println("Hello world")`
`73`	`76`	`}`
`74`	`77`
`75`	`78`	`func multiIfFunc() {`
`76`	`79`	`if 1 == 1 &&`
`77`		`- 2 == 2 {`
	`80`	`+ 2 == 2 { // want "multi-line statement should be followed by a newline"`
`78`	`81`	`fmt.Println("Hello multi-line world")`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`if true {`
`82`	`85`	`if true {`
`83`	`86`	`if true {`
`84`	`87`	`if 1 == 1 &&`
`85`		`- 2 == 2 {`
	`88`	`+ 2 == 2 { // want "multi-line statement should be followed by a newline"`
`86`	`89`	`fmt.Println("Hello nested multi-line world")`
`87`	`90`	`}`
`88`	`91`	`}`
`89`	`92`	`}`
`90`	`93`	`}`
`91`	`94`	`}`
`92`	`95`
`93`		`-func notGoFmted() {`
	`96`	`+func notGoFmted() { // want "unnecessary leading newline"`
`94`	`97`
`95`	`98`
`96`	`99`
`@@ -99,4 +102,4 @@ func notGoFmted() {`
`99`	`102`
`100`	`103`
`101`	`104`
`102`		`-}`
	`105`	`+} // want "unnecessary trailing newline"`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ import (`
`6`	`6`	`"github.com/golangci/golangci-lint/test/testshared/integration"`
`7`	`7`	`)`
`8`	`8`
	`9`	`+func TestFromTestdata(t *testing.T) {`
	`10`	`+ integration.RunTestdata(t)`
	`11`	`+}`
	`12`	`+`
`9`	`13`	`func TestFix(t *testing.T) {`
`10`	`14`	`integration.RunFix(t)`
`11`	`15`	`}`