Keep empty packages by default in testdox format

And only hide Fuzz test cases, always report the top level test function.
gotestyourself · Aug 27, 2023 · c768413 · c768413
1 parent 61b66b7
commit c768413
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/testjson/format.go b/testjson/format.go
@@ -103,8 +103,7 @@ func testDoxFormat(out io.Writer, opts FormatOptions) EventFormatter {
 			if !event.Action.IsTerminal() {
 				return nil
 			}
-			if len(results[event.Package]) == 0 {
-				// No testdox for you
+			if opts.HideEmptyPackages && len(results[event.Package]) == 0 {
 				return nil
 			}
 			fmt.Fprintf(buf, "%s:\n", event.Package)
@@ -123,7 +122,7 @@ func testDoxFormat(out io.Writer, opts FormatOptions) EventFormatter {
 		case event.Action.IsTerminal():
 			// Fuzz test cases tend not to have interesting names,
 			// so only report these if they're failures
-			if strings.HasPrefix(event.Test, "Fuzz") && event.Action == ActionPass {
+			if isFuzzCase(event) {
 				return nil
 			}
 			results[event.Package] = append(results[event.Package], Result{
@@ -135,6 +134,12 @@ func testDoxFormat(out io.Writer, opts FormatOptions) EventFormatter {
 	})
 }
 
+func isFuzzCase(event TestEvent) bool {
+	return strings.HasPrefix(event.Test, "Fuzz") &&
+		event.Action == ActionPass &&
+		TestName(event.Test).IsSubTest()
+}
+
 func testNameFormat(out io.Writer) EventFormatter {
 	buf := bufio.NewWriter(out)
 	// nolint:errcheck

diff --git a/testjson/testdata/format/testdox-coverage.out b/testjson/testdata/format/testdox-coverage.out
@@ -1,3 +1,5 @@
+gotest.tools/gotestsum/testjson/internal/badmain:
+
 gotest.tools/gotestsum/testjson/internal/good:
  ✓ Nested success (0.00s)
  ✓ Nested success a (0.00s)

diff --git a/testjson/testdata/format/testdox-shuffle.out b/testjson/testdata/format/testdox-shuffle.out
@@ -1,3 +1,5 @@
+gotest.tools/gotestsum/testjson/internal/badmain:
+
 gotest.tools/gotestsum/testjson/internal/good:
  ✓ Nested success (0.00s)
  ✓ Nested success a (0.00s)

diff --git a/testjson/testdata/format/testdox.out b/testjson/testdata/format/testdox.out
@@ -1,3 +1,7 @@
+gotest.tools/gotestsum/testjson/internal/badmain:
+
+gotest.tools/gotestsum/testjson/internal/empty:
+
 gotest.tools/gotestsum/testjson/internal/good:
  ✓ Nested success (0.00s)
  ✓ Nested success a (0.00s)