tests: add missing whitespace tests

golangci · Dec 16, 2024 · ca51724 · ca51724
1 parent 3763e1a
commit ca51724
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 39 deletions.
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,39 +1,22 @@
+//go:build ignore
+
+// TODO(ldez) the linter doesn't support cgo.
 //golangcitest:args -Ewhitespace
 //golangcitest:config_path testdata/whitespace.yml
 package testdata
 
-/*
- #include <stdio.h>
- #include <stdlib.h>
-
- void myprint(char* s) {
- 	printf("%d\n", s);
- }
-*/
-import "C"
-
-import (
-	"fmt"
-	"strings"
-	"unsafe"
-)
-
-func _() {
-	cs := C.CString("Hello from stdio\n")
-	C.myprint(cs)
-	C.free(unsafe.Pointer(cs))
-}
+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() {
 }
@@ -61,36 +44,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 +82,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)
 }