move files out of tests

Author: mattfenwick

pkg/connectivity/junit.go

@@ -4,7 +4,6 @@ import (
 	"encoding/xml"
 	junit "github.com/jstemmer/go-junit-report/formatter"
 	"github.com/sirupsen/logrus"
-	"io"
 	"os"
 )
 
@@ -13,15 +12,9 @@ type JUnitTestResult struct {
 	Name   string
 }
 
-func PrintJUnitResults(filename string, results []*Result, ignoreLoopback bool) {
+func PrintJUnitResults(filename string, results []*Result, ignoreLoopback bool) error {
 	if filename == "" {
-		return
-	}
-
-	f, err := os.Create(filename)
-	if err != nil {
-		logrus.Errorf("Unable to create file %q for junit output: %v\n", filename, err)
-		return
+		return nil
 	}
 
 	var junitResults []*JUnitTestResult
@@ -32,20 +25,20 @@ func PrintJUnitResults(filename string, results []*Result, ignoreLoopback bool)
 		})
 	}
 
-	defer f.Close()
-	if err := printJunit(f, junitResults); err != nil {
-		logrus.Errorf("Unable to write junit output: %v\n", err)
+	f, err := os.Create(filename)
+	if err != nil {
+		logrus.Errorf("Unable to create file %q for junit output: %v\n", filename, err)
+		return err
 	}
-}
+	defer f.Close()
 
-func printJunit(w io.Writer, results []*JUnitTestResult) error {
-	s := resultsToJUnit(results)
-	enc := xml.NewEncoder(w)
+	junitTestSuite := ResultsToJUnit(junitResults)
+	enc := xml.NewEncoder(f)
 	enc.Indent("", "    ")
-	return enc.Encode(s)
+	return enc.Encode(junitTestSuite)
 }
 
-func resultsToJUnit(results []*JUnitTestResult) junit.JUnitTestSuite {
+func ResultsToJUnit(results []*JUnitTestResult) junit.JUnitTestSuite {
 	var testCases []junit.JUnitTestCase
 	failed := 0
 
@@ -55,6 +48,7 @@ func resultsToJUnit(results []*JUnitTestResult) junit.JUnitTestSuite {
 		}
 		if !result.Passed {
 			testCase.Failure = &junit.JUnitFailure{}
+			failed++
 		}
 		testCases = append(testCases, testCase)
 	}

pkg/connectivity/printer.go

@@ -2,6 +2,7 @@ package connectivity
 
 import (
 	"fmt"
+	log "github.com/sirupsen/logrus"
 	"math"
 	"sort"
 	"strings"
@@ -33,7 +34,10 @@ func (t *Printer) PrintSummary() {
 
 	fmt.Printf("Feature results:\n%s\n\n", t.printMarkdownFeatureTable(summary.FeaturePrimaryCounts, summary.FeatureCounts))
 	fmt.Printf("Tag results:\n%s\n", t.printMarkdownFeatureTable(summary.TagPrimaryCounts, summary.TagCounts))
-	PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback)
+
+	if err := PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback); err != nil {
+		log.Errorf("unable to dump JUnit test results: %+v", err)
+	}
 }
 
 const (

pkg/connectivity/printer_test.go

@@ -1,57 +1,51 @@
 package connectivity
 
 import (
-	"bytes"
-	"flag"
-	"fmt"
+	junit "github.com/jstemmer/go-junit-report/formatter"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 )
 
-var update = flag.Bool("update", false, "update .golden files")
-
 func RunPrinterTests() {
-	Describe("Test junit file print", func() {
-		testCases := []struct {
-			desc       string
-			results    []*JUnitTestResult
-			expectFile string
-			expectErr  string
-		}{
-			{
-				desc:       "Empty summary",
-				results:    nil,
-				expectFile: "testdata/empty-summary.golden.xml",
-			}, {
-				desc: "2 pass 2 fail",
-				results: []*JUnitTestResult{
-					{Name: "test1", Passed: true},
-					{Name: "test2 with spaces", Passed: false},
-					{Name: "test3 with + special %chars/", Passed: true},
-					{Name: "test4 with\nnewlines", Passed: false},
+	Describe("JUnit cyclonus output", func() {
+		It("should convert results to junit", func() {
+			testCases := []struct {
+				desc    string
+				results []*JUnitTestResult
+				junit   junit.JUnitTestSuite
+			}{
+				{
+					desc:    "Empty summary",
+					results: nil,
+					junit: junit.JUnitTestSuite{
+						Failures:  0,
+						Name:      "cyclonus",
+						TestCases: nil,
+					},
+				}, {
+					desc: "2 pass 2 fail",
+					results: []*JUnitTestResult{
+						{Name: "test1", Passed: true},
+						{Name: "test2 with spaces", Passed: false},
+						{Name: "test3 with + special %chars/", Passed: true},
+						{Name: "test4 with\nnewlines", Passed: false},
+					},
+					junit: junit.JUnitTestSuite{
+						Failures: 2,
+						Name:     "cyclonus",
+						TestCases: []junit.JUnitTestCase{
+							{Name: "test1", Failure: nil},
+							{Name: "test2 with spaces", Failure: &junit.JUnitFailure{}},
+							{Name: "test3 with + special %chars/", Failure: nil},
+							{Name: "test4 with\nnewlines", Failure: &junit.JUnitFailure{}},
+						},
+					},
 				},
-				expectFile: "testdata/2-pass-2-fail.golden.xml",
-			},
-		}
-		for _, testCase := range testCases {
-			var output bytes.Buffer
-			err := printJunit(&output, testCase.results)
-			if err != nil {
-				Expect(len(testCase.expectErr)).ToNot(Equal(0))
-				Expect(err.Error()).To(Equal(testCase.expectErr))
 			}
-
-			if *update {
-				err := ioutil.WriteFile(testCase.expectFile, output.Bytes(), 0666)
-				Expect(err).To(BeNil())
-			} else {
-				fileData, err := ioutil.ReadFile(testCase.expectFile)
-				Expect(err).To(BeNil())
-				fmt.Printf("expected: \n%s\n", fileData)
-				fmt.Printf("actual: \n%s\n", output.Bytes())
-				Expect(bytes.Equal(fileData, output.Bytes())).To(BeTrue())
+			for _, testCase := range testCases {
+				actual := ResultsToJUnit(testCase.results)
+				Expect(actual).To(Equal(testCase.junit))
 			}
-		}
+		})
 	})
 }