Xcresult3 (#90)

* xcresult format 3 converter

* restucture xcresult3 package

* models test

* structs broken into multiple files, attachment image export added

* removed unnecessary comment

* xcresult converters detect func update

* dep update

* import new xcresult converter

* dep update

* errcheck fix

* some debug logs

* some more debug logging

* debug log fix, document parsing fix

* version conversation fix

* do not fail in case of test report issues

* struct indent fix, error logging fix

* check if xcresulttool available

main.go

@@ -233,16 +233,16 @@ func main() {
 
 		testResults, err := test.ParseTestResults(config.TestDeployDir)
 		if err != nil {
-			fail("Error during parsing test results: ", err)
-		}
-
-		log.Printf("- uploading (%d) test results", len(testResults))
+			log.Warnf("Error during parsing test results: ", err)
+		} else {
+			log.Printf("- uploading (%d) test results", len(testResults))
 
-		if err := testResults.Upload(config.AddonAPIToken, config.AddonAPIBaseURL, config.AppSlug, config.BuildSlug); err != nil {
-			fail("Failed to upload test results: ", err)
+			if err := testResults.Upload(config.AddonAPIToken, config.AddonAPIBaseURL, config.AppSlug, config.BuildSlug); err != nil {
+				log.Warnf("Failed to upload test results: ", err)
+			} else {
+				log.Donef("Success")
+			}
 		}
-
-		log.Donef("Success")
 	}
 }
 

test/converters/converters.go

@@ -8,6 +8,7 @@ package converters
 import (
 	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/junitxml"
 	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/xcresult"
+	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/converters/xcresult3"
 	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/junit"
 )
 
@@ -20,6 +21,7 @@ type Intf interface {
 var converters = []Intf{
 	&junitxml.Converter{},
 	&xcresult.Converter{},
+	&xcresult3.Converter{},
 }
 
 // List lists all supported converters

test/converters/xcresult/xcresult.go

@@ -2,9 +2,9 @@ package xcresult
 
 import (
 	"path/filepath"
-	"strings"
 
 	"github.com/bitrise-io/go-utils/fileutil"
+	"github.com/bitrise-io/go-utils/pathutil"
 	"github.com/bitrise-steplib/steps-deploy-to-bitrise-io/test/junit"
 	"howett.net/plist"
 )
@@ -19,8 +19,13 @@ type Converter struct {
 func (h *Converter) Detect(files []string) bool {
 	h.files = files
 	for _, file := range h.files {
-		if strings.HasSuffix(file, ".xcresult") {
-			h.testSummariesPlistPath = filepath.Join(file, "TestSummaries.plist")
+		if filepath.Ext(file) == ".xcresult" {
+			testSummariesPlistPath := filepath.Join(file, "TestSummaries.plist")
+			if exist, err := pathutil.IsPathExists(testSummariesPlistPath); err != nil || exist == false {
+				continue
+			}
+
+			h.testSummariesPlistPath = testSummariesPlistPath
 			return true
 		}
 	}

test/converters/xcresult3/action_invocation_record.go

@@ -0,0 +1,90 @@
+package xcresult3
+
+import (
+	"fmt"
+	"strings"
+)
+
+// ActionsInvocationRecord ...
+type ActionsInvocationRecord struct {
+	Actions struct {
+		Values []struct {
+			ActionResult struct {
+				TestsRef struct {
+					ID struct {
+						Value string `json:"_value"`
+					} `json:"id"`
+				} `json:"testsRef"`
+			} `json:"actionResult"`
+		} `json:"_values"`
+	} `json:"actions"`
+
+	Issues Issues `json:"issues"`
+}
+
+// Issues ...
+type Issues struct {
+	TestFailureSummaries TestFailureSummaries `json:"testFailureSummaries"`
+}
+
+// TestFailureSummaries ...
+type TestFailureSummaries struct {
+	Values []TestFailureSummary `json:"_values"`
+}
+
+// TestFailureSummary ...
+type TestFailureSummary struct {
+	DocumentLocationInCreatingWorkspace DocumentLocationInCreatingWorkspace `json:"documentLocationInCreatingWorkspace"`
+	Message                             Message                             `json:"message"`
+	ProducingTarget                     ProducingTarget                     `json:"producingTarget"`
+	TestCaseName                        TestCaseName                        `json:"testCaseName"`
+}
+
+// URL ...
+type URL struct {
+	Value string `json:"_value"`
+}
+
+// DocumentLocationInCreatingWorkspace ...
+type DocumentLocationInCreatingWorkspace struct {
+	URL URL `json:"url"`
+}
+
+// ProducingTarget ...
+type ProducingTarget struct {
+	Value string `json:"_value"`
+}
+
+// TestCaseName ...
+type TestCaseName struct {
+	Value string `json:"_value"`
+}
+
+// Message ...
+type Message struct {
+	Value string `json:"_value"`
+}
+
+// failure returns the ActionTestSummaryGroup's failure reason from the ActionsInvocationRecord.
+func (r ActionsInvocationRecord) failure(test ActionTestSummaryGroup) string {
+	target, testCase := test.producingTargetAndTestCaseName()
+	for _, failureSummary := range r.Issues.TestFailureSummaries.Values {
+		if failureSummary.ProducingTarget.Value == target && failureSummary.TestCaseName.Value == testCase {
+			file, line := failureSummary.fileAndLineNumber()
+			return fmt.Sprintf("%s:%s - %s", file, line, failureSummary.Message.Value)
+		}
+	}
+	return ""
+}
+
+// fileAndLineNumber unwraps the file path and line number descriptor from a given ActionTestSummaryGroup's.
+func (s TestFailureSummary) fileAndLineNumber() (file string, line string) {
+	// file:\/\/\/Users\/bitrisedeveloper\/Develop\/ios\/Xcode11Test\/Xcode11TestUITests\/Xcode11TestUITests.swift#CharacterRangeLen=0&EndingLineNumber=42&StartingLineNumber=42
+	if s.DocumentLocationInCreatingWorkspace.URL.Value != "" {
+		i := strings.LastIndex(s.DocumentLocationInCreatingWorkspace.URL.Value, "#")
+		if i > -1 && i+1 < len(s.DocumentLocationInCreatingWorkspace.URL.Value) {
+			return s.DocumentLocationInCreatingWorkspace.URL.Value[:i], s.DocumentLocationInCreatingWorkspace.URL.Value[i+1:]
+		}
+	}
+	return
+}