Merge pull request #1296 from Workiva/updateTestRunExample

nevkontakte · web-flow · commit 70aef047c9ab · 2024-04-21T13:18:52.000+01:00
[go1.20] Update test run example native override
diff --git a/compiler/natives/src/testing/example.go b/compiler/natives/src/testing/example.go
@@ -6,12 +6,11 @@ package testing
 import (
 	"fmt"
 	"os"
-	"strings"
 	"time"
 )
 
 func runExample(eg InternalExample) (ok bool) {
-	if *chatty {
+	if chatty.on {
 		fmt.Printf("=== RUN   %s\n", eg.Name)
 	}
 
@@ -24,12 +23,12 @@ func runExample(eg InternalExample) (ok bool) {
 	}
 	os.Stdout = w
 
+	finished := false
 	start := time.Now()
-	ok = true
 
 	// Clean up in a deferred call so we can recover if the example panics.
 	defer func() {
-		dstr := fmtDuration(time.Now().Sub(start))
+		timeSpent := time.Since(start)
 
 		// Close file, restore stdout, get output.
 		w.Close()
@@ -41,31 +40,12 @@ func runExample(eg InternalExample) (ok bool) {
 			os.Exit(1)
 		}
 
-		var fail string
 		err := recover()
-		got := strings.TrimSpace(string(out))
-		want := strings.TrimSpace(eg.Output)
-		if eg.Unordered {
-			if sortLines(got) != sortLines(want) && err == nil {
-				fail = fmt.Sprintf("got:\n%s\nwant (unordered):\n%s\n", string(out), eg.Output)
-			}
-		} else {
-			if got != want && err == nil {
-				fail = fmt.Sprintf("got:\n%s\nwant:\n%s\n", got, want)
-			}
-		}
-		if fail != "" || err != nil {
-			fmt.Printf("--- FAIL: %s (%s)\n%s", eg.Name, dstr, fail)
-			ok = false
-		} else if *chatty {
-			fmt.Printf("--- PASS: %s (%s)\n", eg.Name, dstr)
-		}
-		if err != nil {
-			panic(err)
-		}
+		ok = eg.processRunResult(string(out), timeSpent, finished, err)
 	}()
 
 	// Run example.
 	eg.F()
+	finished = true
 	return
 }
