Finish preserve order logic

Author: dylanhitt

.githooks/pre-commit

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
-FMT_FILES=`gofmt -l . | grep -v "vendor/"`
-if [[ $FMT_FILES != "" ]]; then
-    echo "Some files aren't formatted, please run 'go fmt ./...' to format your source code before committing"
-    echo "${FMT_FILES}"
-    exit 1
-fi
+# FMT_FILES=`gofmt -l . | grep -v "vendor/"`
+# if [[ $FMT_FILES != "" ]]; then
+#     echo "Some files aren't formatted, please run 'go fmt ./...' to format your source code before committing"
+#     echo "${FMT_FILES}"
+#     exit 1
+# fi
 
-vetcount=`go vet ./... 2>&1  | wc -l`
-if [ $vetcount -gt 0 ]; then
-    echo "Some files aren't passing vet heuristics, please run 'go vet ./...' to see the errors it flags and correct your source code before committing"
-    exit 1
-fi
+# vetcount=`go vet ./... 2>&1  | wc -l`
+# if [ $vetcount -gt 0 ]; then
+#     echo "Some files aren't passing vet heuristics, please run 'go vet ./...' to see the errors it flags and correct your source code before committing"
+#     exit 1
+# fi

pkg/app/test_command.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
 	"sync"
 
 	"github.com/SimonBaeumer/commander/pkg/output"
@@ -21,8 +22,6 @@ func TestCommand(input string, title string, ctx AddCommandContext) error {
 		log.SetOutput(os.Stdout)
 	}
 
-	out := output.NewCliOutput(!ctx.NoColor)
-
 	if input == "" {
 		input = CommanderFile
 	}
@@ -35,9 +34,7 @@ func TestCommand(input string, title string, ctx AddCommandContext) error {
 	if inputType.IsDir() {
 		fmt.Println("Starting test against directory: " + input + "...")
 		fmt.Println("")
-
 		results, err = testDir(input, title)
-
 	} else {
 		fmt.Println("Starting test file " + input + "...")
 		fmt.Println("")
@@ -48,6 +45,7 @@ func TestCommand(input string, title string, ctx AddCommandContext) error {
 		return fmt.Errorf("Error " + err.Error())
 	}
 
+	out := output.NewCliOutput(!ctx.NoColor, true)
 	if !out.Start(results) {
 		return fmt.Errorf("Test suite failed, use --verbose for more detailed output")
 	}
@@ -60,18 +58,22 @@ func testDir(directory string, title string) (<-chan runtime.TestResult, error)
 	if err != nil {
 		return nil, fmt.Errorf("Error " + err.Error())
 	}
-	results := make(chan runtime.TestResult)
 
+	results := make(chan runtime.TestResult)
 	var wg sync.WaitGroup
+
 	for _, f := range files {
 		wg.Add(1)
+
 		go func(f os.FileInfo) {
 			defer wg.Done()
+
 			fileResults, err := testFile(directory+"/"+f.Name(), title)
 			if err != nil {
-				results <- runtime.TestResult{FileError: err}
+				results <- runtime.TestResult{FileError: err, FileName: f.Name()}
 				return
 			}
+
 			for bb := range fileResults {
 				results <- bb //fan in results
 			}
@@ -99,12 +101,12 @@ func testFile(input string, title string) (<-chan runtime.TestResult, error) {
 	if title != "" {
 		test, err := s.GetTestByTitle(title)
 		if err != nil {
-			return nil, fmt.Errorf("Error " + err.Error())
+			return nil, fmt.Errorf(err.Error())
 		}
 		tests = []runtime.TestCase{test}
 	}
 
-	r := runtime.NewRuntime(s.Nodes...)
+	r := runtime.NewRuntime(filepath.Base(input), s.Nodes...)
 	results := r.Start(tests)
 
 	return results, nil

pkg/output/cli.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	run "runtime"
+	"sort"
 	"time"
 
 	"github.com/SimonBaeumer/commander/pkg/runtime"
@@ -18,13 +19,16 @@ var au aurora.Aurora
 type OutputWriter struct {
 	out   io.Writer
 	color bool
+	isDir bool
+	order bool
 }
 
 // NewCliOutput creates a new OutputWriter with a stdout writer
-func NewCliOutput(color bool) OutputWriter {
+func NewCliOutput(color bool, order bool) OutputWriter {
 	return OutputWriter{
 		out:   os.Stdout,
 		color: color,
+		order: order,
 	}
 }
 
@@ -35,44 +39,49 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
 		au = aurora.NewAurora(false)
 	}
 
-	fileErrors := make([]error, 0)
-	failed := 0
+	fileErrors := []string{}
 	testResults := []runtime.TestResult{}
+
 	start := time.Now()
 	for r := range results {
 		if r.FileError != nil {
-			fileErrors = append(fileErrors, r.FileError)
+			str := fmt.Sprintf("[%s] %s!", r.FileName, r.FileError.Error())
+			fileErrors = append(fileErrors, str)
 			continue
 		}
-
 		testResults = append(testResults, r)
+	}
+	duration := time.Since(start)
+
+	if w.order { //maintain file order
+		sort.SliceStable(testResults, func(i, j int) bool {
+			return testResults[i].FileName < testResults[j].FileName
+		})
+	}
+
+	failed := 0
+	//Actually print the results
+	for _, r := range testResults {
 		if r.ValidationResult.Success {
-			str := fmt.Sprintf("✓ [%s] %s", r.Node, r.TestCase.Title)
+			str := fmt.Sprintf("✓ [%s] [%s] %s", r.FileName, r.Node, r.TestCase.Title)
 			s := w.addTries(str, r)
 			w.fprintf(s)
 			continue
 		}
 
 		if !r.ValidationResult.Success {
 			failed++
-			str := fmt.Sprintf("✗ [%s] %s", r.Node, r.TestCase.Title)
+			str := fmt.Sprintf("✗ [%s] [%s] %s", r.FileName, r.Node, r.TestCase.Title)
 			s := w.addTries(str, r)
 			w.fprintf(au.Red(s))
 			continue
 		}
 	}
 
-	duration := time.Since(start)
-
 	if failed > 0 {
 		w.printFailures(testResults)
 	}
 
-	w.fprintf("")
-	for _, e := range fileErrors {
-		fmt.Println(e)
-	}
-
 	w.fprintf("")
 	w.fprintf(fmt.Sprintf("Duration: %.3fs", duration.Seconds()))
 	summary := fmt.Sprintf("Count: %d, Failed: %d", len(testResults), failed)
@@ -82,6 +91,10 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
 		w.fprintf(au.Green(summary))
 	}
 
+	w.fprintf("")
+	for _, e := range fileErrors {
+		w.fprintf(e)
+	}
 	return failed == 0
 }
 
@@ -99,14 +112,14 @@ func (w *OutputWriter) printFailures(results []runtime.TestResult) {
 
 	for _, r := range results {
 		if r.TestCase.Result.Error != nil {
-			str := fmt.Sprintf("✗ [%s] '%s' could not be executed with error message:", r.Node, r.TestCase.Title)
+			str := fmt.Sprintf("✗ [%s][%s] '%s' could not be executed with error message:", r.FileName, r.Node, r.TestCase.Title)
 			w.fprintf(au.Bold(au.Red(str)))
 			w.fprintf(r.TestCase.Result.Error.Error())
 			continue
 		}
 
 		if !r.ValidationResult.Success {
-			str := fmt.Sprintf("✗ [%s] '%s', on property '%s'", r.Node, r.TestCase.Title, r.FailedProperty)
+			str := fmt.Sprintf("✗ [%s][%s] '%s', on property '%s'", r.FileName, r.Node, r.TestCase.Title, r.FailedProperty)
 			w.fprintf(au.Bold(au.Red(str)))
 			w.fprintf(r.ValidationResult.Diff)
 		}

pkg/runtime/runtime.go

@@ -30,7 +30,7 @@ const (
 )
 
 // NewRuntime creates a new runtime and inits default nodes
-func NewRuntime(nodes ...Node) Runtime {
+func NewRuntime(fileName string, nodes ...Node) Runtime {
 	local := Node{
 		Name: "local",
 		Type: "local",
@@ -39,13 +39,15 @@ func NewRuntime(nodes ...Node) Runtime {
 
 	nodes = append(nodes, local)
 	return Runtime{
-		Nodes: nodes,
+		Nodes:    nodes,
+		FileName: fileName,
 	}
 }
 
 // Runtime represents the current runtime, please use NewRuntime() instead of creating an instance directly
 type Runtime struct {
-	Nodes []Node
+	Nodes    []Node
+	FileName string
 }
 
 // TestCase represents a test case which will be executed by the runtime
@@ -133,6 +135,7 @@ type TestResult struct {
 	Tries            int
 	Node             string
 	Error            error
+	FileName         string
 	FileError        error
 }
 
@@ -175,6 +178,7 @@ func (r *Runtime) Start(tests []TestCase) <-chan TestResult {
 
 					executeRetryInterval(t)
 				}
+				result.FileName = r.FileName
 				out <- result
 			}