difftest: Sync code

wader · Oct 29, 2021 · 1e1ad14 · 1e1ad14
1 parent 67898cb
commit 1e1ad14
Showing 1 changed file with 41 additions and 43 deletions.
diff --git a/internal/difftest/difftest.go b/internal/difftest/difftest.go
@@ -114,63 +114,61 @@ func Fatal(t tf, expected string, actual string) {
 func TestWithOptions(t *testing.T, opts Options) {
 	t.Helper()
 
-	func() {
+	t.Helper()
+
+	// done in two steps as it seems hard to mark some functions inside filepath.Walk as test helpers
+	var paths []string
+	if err := filepath.Walk(opts.Path, func(path string, info os.FileInfo, err error) error {
 		t.Helper()
 
-		// done in two steps as it seems hard to mark some functions inside filepath.Walk as test helpers
-		var paths []string
-		if err := filepath.Walk(opts.Path, func(path string, info os.FileInfo, err error) error {
-			t.Helper()
+		if err != nil {
+			return err
+		}
+		match, err := filepath.Match(filepath.Join(filepath.Dir(path), opts.Pattern), path)
+		if err != nil {
+			return err
+		} else if !match {
+			return nil
+		}
 
+		paths = append(paths, path)
+		return nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	for _, p := range paths {
+		t.Run(p, func(t *testing.T) {
+			t.Helper()
+			input, err := ioutil.ReadFile(p)
 			if err != nil {
-				return err
+				t.Fatal(err)
 			}
-			match, err := filepath.Match(filepath.Join(filepath.Dir(path), opts.Pattern), path)
+
+			outputPath, output, err := opts.Fn(t, p, string(input))
 			if err != nil {
-				return err
-			} else if !match {
-				return nil
+				t.Fatal(err)
 			}
 
-			paths = append(paths, path)
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		for _, p := range paths {
-			t.Run(p, func(t *testing.T) {
-				t.Helper()
-				input, err := ioutil.ReadFile(p)
-				if err != nil {
-					t.Fatal(err)
+			expectedOutput, expectedOutputErr := ioutil.ReadFile(outputPath)
+			if opts.WriteOutput {
+				if expectedOutputErr == nil && string(expectedOutput) == output {
+					return
 				}
 
-				outputPath, output, err := opts.Fn(t, p, string(input))
-				if err != nil {
+				if err := ioutil.WriteFile(outputPath, []byte(output), 0644); err != nil { //nolint:gosec
 					t.Fatal(err)
 				}
+				return
+			}
 
-				expectedOutput, expectedOutputErr := ioutil.ReadFile(outputPath)
-				if opts.WriteOutput {
-					if expectedOutputErr == nil && string(expectedOutput) == output {
-						return
-					}
-
-					if err := ioutil.WriteFile(outputPath, []byte(output), 0644); err != nil { //nolint:gosec
-						t.Fatal(err)
-					}
-					return
-				}
-
-				if expectedOutputErr != nil {
-					t.Fatal(expectedOutputErr)
-				}
+			if expectedOutputErr != nil {
+				t.Fatal(expectedOutputErr)
+			}
 
-				ErrorEx(t, opts.ColorDiff, string(expectedOutput), output)
-			})
-		}
-	}()
+			ErrorEx(t, opts.ColorDiff, string(expectedOutput), output)
+		})
+	}
 }
 
 func Test(t *testing.T, pattern string, fn Fn) {