From d4db25e57d80e8ca5dda55ad26cc1d101674afff Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janoszen@users.noreply.github.com>
Date: Thu, 20 May 2021 13:49:21 +0200
Subject: [PATCH] Beautify log output

---
 CHANGELOG.md |  4 ++++
 test_main.go | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 289bd4e..1015fc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.5: Beautify log output
+
+This release sorts the tests and displays a collapsible test result even if there are no logs to format the tests uniformly.
+
 ## 1.1.4: Bugfixes for test logger
 
 This release fixes a number of bugs found when using the test logger for GitHub Actions output.
diff --git a/test_main.go b/test_main.go
index f237407..f26cbe7 100644
--- a/test_main.go
+++ b/test_main.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -60,8 +61,13 @@ func runWithGitHubActions(m *testing.M) int {
 	_ = tmpFile.Close()
 	_ = os.Remove(tmpFile.Name())
 
-	for _, testCase := range w.testCases {
-		writeTestcase(testCase)
+	var testCases []string
+	for testCaseName := range w.testCases {
+		testCases = append(testCases, testCaseName)
+	}
+	sort.Strings(testCases)
+	for _, testCaseName := range testCases {
+		writeTestcase(w.testCases[testCaseName])
 	}
 
 	return result
@@ -117,13 +123,11 @@ var logLevelConfig = map[LevelString]logOutputFormat{
 }
 
 func writeTestcase(c *testCase) {
-	if len(c.lines) > 0 {
-		fmt.Printf("::group::")
-	}
+	fmt.Printf("::group::")
 	if c.pass {
 		fmt.Printf("\033[0;32m✅ %s\033[0m (%s)\n", c.name, c.time)
 	} else {
-		fmt.Printf("::group::\033[0;31m❌ %s\033[0m (%s)\n", c.name, c.time)
+		fmt.Printf("\033[0;31m❌ %s\033[0m (%s)\n", c.name, c.time)
 	}
 	for _, line := range c.lines {
 		format := logLevelConfig[line.level]
@@ -137,9 +141,7 @@ func writeTestcase(c *testCase) {
 			line.line,
 		)
 	}
-	if len(c.lines) > 0 {
-		fmt.Printf("::endgroup::\n")
-	}
+	fmt.Printf("::endgroup::\n")
 }
 
 type gitHubActionsWriter struct {
@@ -204,8 +206,6 @@ func (g *gitHubActionsWriter) processFail(line string) string {
 		panic(err)
 	}
 	g.testCases[lastTestCase].time = t
-	writeTestcase(g.testCases[lastTestCase])
-	delete(g.testCases, lastTestCase)
 	lastTestCase = ""
 	return lastTestCase
 }