Base functioninality done, need to switch to templare and add Summary

Author: dylanhitt

pkg/output/cli.go

@@ -44,6 +44,7 @@ type TestResult struct {
 	FailedProperty string
 	Diff           string
 	Error          error
+	Skip           bool
 }
 
 // GetEventHandler create a new runtime.EventHandler
@@ -53,6 +54,12 @@ func (w *OutputWriter) GetEventHandler() *runtime.EventHandler {
 		tr := convertTestResult(testResult)
 		w.printResult(tr)
 	}
+
+	handler.TestSkipped = func(testResult runtime.TestResult) {
+		tr := convertTestResult(testResult)
+		w.printSkipped(tr)
+	}
+
 	return &handler
 }
 
@@ -74,7 +81,7 @@ func (w *OutputWriter) PrintSummary(result runtime.Result) bool {
 	return result.Failed == 0
 }
 
-// PrintResult prints the simple output form of a TestReault
+// printResult prints the simple output form of a TestReault
 func (w *OutputWriter) printResult(r TestResult) {
 	if !r.Success {
 		w.fprintf(w.au.Red(w.template.testResult(r)))
@@ -83,6 +90,10 @@ func (w *OutputWriter) printResult(r TestResult) {
 	w.fprintf(w.template.testResult(r))
 }
 
+func (w *OutputWriter) printSkipped(r TestResult) {
+	w.fprintf(fmt.Sprintf("- [skipped] %s: was skipped", r.Title))
+}
+
 func (w *OutputWriter) printFailures(results []runtime.TestResult) {
 	w.fprintf("")
 	w.fprintf(w.au.Bold("Results"))
@@ -119,6 +130,7 @@ func convertTestResult(tr runtime.TestResult) TestResult {
 		FailedProperty: tr.FailedProperty,
 		Diff:           tr.ValidationResult.Diff,
 		Error:          tr.TestCase.Result.Error,
+		Skip:           tr.Skipped,
 	}
 
 	return testResult

pkg/runtime/runtime.go

@@ -42,6 +42,7 @@ type Runtime struct {
 // EventHandler is a configurable event system that handles events such as test completion
 type EventHandler struct {
 	TestFinished func(TestResult)
+	TestSkipped  func(TestResult)
 }
 
 // TestCase represents a test case which will be executed by the runtime
@@ -133,14 +134,14 @@ func (r *Runtime) Start(tests []TestCase) Result {
 	testCh := r.Runner.Execute(tests)
 	start := time.Now()
 	for tr := range testCh {
-		r.EventHandler.TestFinished(tr)
-
 		if tr.Skipped {
-			result.Skipped++
-			// Do not count as failed
-			tr.ValidationResult.Success = true
+			r.EventHandler.TestSkipped(tr)
+			result.TestResults = append(result.TestResults, tr)
+			continue
 		}
 
+		r.EventHandler.TestFinished(tr)
+
 		if !tr.ValidationResult.Success {
 			result.Failed++
 		}