review: use new test framework

golangci · Aug 21, 2022 · 9406328 · 9406328
1 parent c45b986
commit 9406328
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/test/linters_test.go b/test/linters_test.go
@@ -118,6 +118,14 @@ func findSources(t *testing.T, pathPatterns ...string) []string {
 	return sources
 }
 
-func TestLogrLint(t *testing.T) {
-	testSourcesFromDir(t, filepath.Join(testdataDir, "logrlint"))
+func TestSourcesFromTestdataSubDir(t *testing.T) {
+	subDirs := []string{
+		"logrlint",
+	}
+
+	for _, dir := range subDirs {
+		t.Run(dir, func(t *testing.T) {
+			testSourcesFromDir(t, filepath.Join(testdataDir, dir))
+		})
+	}
 }
diff --git a/test/testdata/logrlint/example.go → test/testdata/logrlint/logrlint.go b/test/testdata/logrlint/example.go → test/testdata/logrlint/logrlint.go
@@ -9,8 +9,8 @@ import (
 
 func Example() {
 	log := logr.Discard()
-	log = log.WithValues("key")                                         // Error `odd number of arguments passed as key-value pairs for logging`
-	log.Info("message", "key1", "value1", "key2", "value2", "key3")     // Error `odd number of arguments passed as key-value pairs for logging`
-	log.Error(fmt.Errorf("error"), "message", "key1", "value1", "key2") // Error `odd number of arguments passed as key-value pairs for logging`
+	log = log.WithValues("key")                                         // want `odd number of arguments passed as key-value pairs for logging`
+	log.Info("message", "key1", "value1", "key2", "value2", "key3")     // want `odd number of arguments passed as key-value pairs for logging`
+	log.Error(fmt.Errorf("error"), "message", "key1", "value1", "key2") // want `odd number of arguments passed as key-value pairs for logging`
 	log.Error(fmt.Errorf("error"), "message", "key1", "value1", "key2", "value2")
 }