fastlane 2.224.0 → 2.232.0

data/trainer/lib/trainer/xcresult.rb

@@ -1,398 +1,41 @@
-module Trainer
-  module XCResult
-    # Model attributes and relationships taken from running the following command:
-    # xcrun xcresulttool formatDescription
-
-    class AbstractObject
-      attr_accessor :type
-      def initialize(data)
-        self.type = data["_type"]["_name"]
-      end
-
-      def fetch_value(data, key)
-        return (data[key] || {})["_value"]
-      end
-
-      def fetch_values(data, key)
-        return (data[key] || {})["_values"] || []
-      end
-    end
-
-    # - ActionTestPlanRunSummaries
-    #   * Kind: object
-    #   * Properties:
-    #     + summaries: [ActionTestPlanRunSummary]
-    class ActionTestPlanRunSummaries < AbstractObject
-      attr_accessor :summaries
-      def initialize(data)
-        self.summaries = fetch_values(data, "summaries").map do |summary_data|
-          ActionTestPlanRunSummary.new(summary_data)
-        end
-        super
-      end
-    end
-
-    # - ActionAbstractTestSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + name: String?
-    class ActionAbstractTestSummary < AbstractObject
-      attr_accessor :name
-      def initialize(data)
-        self.name = fetch_value(data, "name")
-        super
-      end
-    end
-
-    # - ActionTestPlanRunSummary
-    #   * Supertype: ActionAbstractTestSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + testableSummaries: [ActionTestableSummary]
-    class ActionTestPlanRunSummary < ActionAbstractTestSummary
-      attr_accessor :testable_summaries
-      def initialize(data)
-        self.testable_summaries = fetch_values(data, "testableSummaries").map do |summary_data|
-          ActionTestableSummary.new(summary_data)
-        end
-        super
-      end
-    end
-
-    # - ActionTestableSummary
-    #   * Supertype: ActionAbstractTestSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + projectRelativePath: String?
-    #     + targetName: String?
-    #     + testKind: String?
-    #     + tests: [ActionTestSummaryIdentifiableObject]
-    #     + diagnosticsDirectoryName: String?
-    #     + failureSummaries: [ActionTestFailureSummary]
-    #     + testLanguage: String?
-    #     + testRegion: String?
-    class ActionTestableSummary < ActionAbstractTestSummary
-      attr_accessor :project_relative_path
-      attr_accessor :target_name
-      attr_accessor :test_kind
-      attr_accessor :tests
-      def initialize(data)
-        self.project_relative_path = fetch_value(data, "projectRelativePath")
-        self.target_name = fetch_value(data, "targetName")
-        self.test_kind = fetch_value(data, "testKind")
-        self.tests = fetch_values(data, "tests").map do |tests_data|
-          ActionTestSummaryIdentifiableObject.create(tests_data, self)
-        end
-        super
-      end
-
-      def all_tests
-        return tests.map(&:all_subtests).flatten
-      end
-    end
-
-    # - ActionTestSummaryIdentifiableObject
-    #   * Supertype: ActionAbstractTestSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + identifier: String?
-    class ActionTestSummaryIdentifiableObject < ActionAbstractTestSummary
-      attr_accessor :identifier
-      attr_accessor :parent
-      def initialize(data, parent)
-        self.identifier = fetch_value(data, "identifier")
-        self.parent = parent
-        super(data)
-      end
-
-      def all_subtests
-        raise "Not overridden"
-      end
-
-      def self.create(data, parent)
-        type = data["_type"]["_name"]
-        if type == "ActionTestSummaryGroup"
-          return ActionTestSummaryGroup.new(data, parent)
-        elsif type == "ActionTestMetadata"
-          return ActionTestMetadata.new(data, parent)
-        else
-          raise "Unsupported type: #{type}"
-        end
-      end
-    end
-
-    # - ActionTestSummaryGroup
-    #   * Supertype: ActionTestSummaryIdentifiableObject
-    #   * Kind: object
-    #   * Properties:
-    #     + duration: Double
-    #     + subtests: [ActionTestSummaryIdentifiableObject]
-    class ActionTestSummaryGroup < ActionTestSummaryIdentifiableObject
-      attr_accessor :duration
-      attr_accessor :subtests
-      def initialize(data, parent)
-        self.duration = fetch_value(data, "duration").to_f
-        self.subtests = fetch_values(data, "subtests").map do |subtests_data|
-          ActionTestSummaryIdentifiableObject.create(subtests_data, self)
-        end
-        super(data, parent)
-      end
-
-      def all_subtests
-        return subtests.map(&:all_subtests).flatten
-      end
-    end
+require 'json'
+require 'open3'
 
-    # - ActionTestMetadata
-    #   * Supertype: ActionTestSummaryIdentifiableObject
-    #   * Kind: object
-    #   * Properties:
-    #     + testStatus: String
-    #     + duration: Double?
-    #     + summaryRef: Reference?
-    #     + performanceMetricsCount: Int
-    #     + failureSummariesCount: Int
-    #     + activitySummariesCount: Int
-    class ActionTestMetadata < ActionTestSummaryIdentifiableObject
-      attr_accessor :test_status
-      attr_accessor :duration
-      attr_accessor :performance_metrics_count
-      attr_accessor :failure_summaries_count
-      attr_accessor :activity_summaries_count
-      def initialize(data, parent)
-        self.test_status = fetch_value(data, "testStatus")
-        self.duration = fetch_value(data, "duration").to_f
-        self.performance_metrics_count = fetch_value(data, "performanceMetricsCount")
-        self.failure_summaries_count = fetch_value(data, "failureSummariesCount")
-        self.activity_summaries_count = fetch_value(data, "activitySummariesCount")
-        super(data, parent)
-      end
-
-      def all_subtests
-        return [self]
-      end
+require_relative 'xcresult/helper'
+require_relative 'xcresult/test_case_attributes'
+require_relative 'xcresult/repetition'
+require_relative 'xcresult/test_case'
+require_relative 'xcresult/test_suite'
+require_relative 'xcresult/test_plan'
 
-      def find_failure(failures)
-        sanitizer = proc { |name| name.gsub(/\W/, "_") }
-        sanitized_identifier = sanitizer.call(self.identifier)
-        if self.test_status == "Failure"
-          # Tries to match failure on test case name
-          # Example TestFailureIssueSummary:
-          #   producingTarget: "TestThisDude"
-          #   test_case_name: "TestThisDude.testFailureJosh2()" (when Swift)
-          #     or "-[TestThisDudeTests testFailureJosh2]" (when Objective-C)
-          # Example ActionTestMetadata
-          #   identifier: "TestThisDude/testFailureJosh2()" (when Swift)
-          #     or identifier: "TestThisDude/testFailureJosh2" (when Objective-C)
-
-          found_failure = failures.find do |failure|
-            # Sanitize both test case name and identifier in a consistent fashion, then replace all non-word
-            # chars with underscore, and compare them
-            sanitized_test_case_name = sanitizer.call(failure.test_case_name)
-            sanitized_identifier == sanitized_test_case_name
+module Trainer
+  # Model xcresulttool JSON output for Xcode16+ version of xcresulttool
+  # See JSON schema from `xcrun xcresulttool get test-results tests --help`
+  module XCResult
+    module Parser
+      class << self
+        # Parses an xcresult file and returns a TestPlan object
+        #
+        # @param path [String] The path to the xcresult file
+        # @param output_remove_retry_attempts [Boolean] Whether to remove retry attempts from the output
+        # @return [TestPlan] A TestPlan object containing the test results
+        def parse_xcresult(path:, output_remove_retry_attempts: false)
+          json = xcresult_to_json(path)
+
+          TestPlan.from_json(
+            json: json
+          ).tap do |test_plan|
+            test_plan.output_remove_retry_attempts = output_remove_retry_attempts
           end
-          return found_failure
-        else
-          return nil
-        end
-      end
-    end
-
-    # - ActionsInvocationRecord
-    #   * Kind: object
-    #   * Properties:
-    #     + metadataRef: Reference?
-    #     + metrics: ResultMetrics
-    #     + issues: ResultIssueSummaries
-    #     + actions: [ActionRecord]
-    #     + archive: ArchiveInfo?
-    class ActionsInvocationRecord < AbstractObject
-      attr_accessor :actions
-      attr_accessor :issues
-      def initialize(data)
-        self.actions = fetch_values(data, "actions").map do |action_data|
-          ActionRecord.new(action_data)
-        end
-        self.issues = ResultIssueSummaries.new(data["issues"])
-        super
-      end
-    end
-
-    # - ActionRecord
-    #   * Kind: object
-    #   * Properties:
-    #     + schemeCommandName: String
-    #     + schemeTaskName: String
-    #     + title: String?
-    #     + startedTime: Date
-    #     + endedTime: Date
-    #     + runDestination: ActionRunDestinationRecord
-    #     + buildResult: ActionResult
-    #     + actionResult: ActionResult
-    class ActionRecord < AbstractObject
-      attr_accessor :scheme_command_name
-      attr_accessor :scheme_task_name
-      attr_accessor :title
-      attr_accessor :build_result
-      attr_accessor :action_result
-      def initialize(data)
-        self.scheme_command_name = fetch_value(data, "schemeCommandName")
-        self.scheme_task_name = fetch_value(data, "schemeTaskName")
-        self.title = fetch_value(data, "title")
-        self.build_result = ActionResult.new(data["buildResult"])
-        self.action_result = ActionResult.new(data["actionResult"])
-        super
-      end
-    end
-
-    # - ActionResult
-    #   * Kind: object
-    #   * Properties:
-    #     + resultName: String
-    #     + status: String
-    #     + metrics: ResultMetrics
-    #     + issues: ResultIssueSummaries
-    #     + coverage: CodeCoverageInfo
-    #     + timelineRef: Reference?
-    #     + logRef: Reference?
-    #     + testsRef: Reference?
-    #     + diagnosticsRef: Reference?
-    class ActionResult < AbstractObject
-      attr_accessor :result_name
-      attr_accessor :status
-      attr_accessor :issues
-      attr_accessor :timeline_ref
-      attr_accessor :log_ref
-      attr_accessor :tests_ref
-      attr_accessor :diagnostics_ref
-      def initialize(data)
-        self.result_name = fetch_value(data, "resultName")
-        self.status = fetch_value(data, "status")
-        self.issues = ResultIssueSummaries.new(data["issues"])
-
-        self.timeline_ref = Reference.new(data["timelineRef"]) if data["timelineRef"]
-        self.log_ref = Reference.new(data["logRef"]) if data["logRef"]
-        self.tests_ref = Reference.new(data["testsRef"]) if data["testsRef"]
-        self.diagnostics_ref = Reference.new(data["diagnosticsRef"]) if data["diagnosticsRef"]
-        super
-      end
-    end
-
-    # - Reference
-    #   * Kind: object
-    #   * Properties:
-    #     + id: String
-    #     + targetType: TypeDefinition?
-    class Reference < AbstractObject
-      attr_accessor :id
-      attr_accessor :target_type
-      def initialize(data)
-        self.id = fetch_value(data, "id")
-        self.target_type = TypeDefinition.new(data["targetType"]) if data["targetType"]
-        super
-      end
-    end
-
-    # - TypeDefinition
-    #   * Kind: object
-    #   * Properties:
-    #     + name: String
-    #     + supertype: TypeDefinition?
-    class TypeDefinition < AbstractObject
-      attr_accessor :name
-      attr_accessor :supertype
-      def initialize(data)
-        self.name = fetch_value(data, "name")
-        self.supertype = TypeDefinition.new(data["supertype"]) if data["supertype"]
-        super
-      end
-    end
-
-    # - DocumentLocation
-    #   * Kind: object
-    #   * Properties:
-    #     + url: String
-    #     + concreteTypeName: String
-    class DocumentLocation < AbstractObject
-      attr_accessor :url
-      attr_accessor :concrete_type_name
-      def initialize(data)
-        self.url = fetch_value(data, "url")
-        self.concrete_type_name = data["concreteTypeName"]["_value"]
-        super
-      end
-    end
-
-    # - IssueSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + issueType: String
-    #     + message: String
-    #     + producingTarget: String?
-    #     + documentLocationInCreatingWorkspace: DocumentLocation?
-    class IssueSummary < AbstractObject
-      attr_accessor :issue_type
-      attr_accessor :message
-      attr_accessor :producing_target
-      attr_accessor :document_location_in_creating_workspace
-      def initialize(data)
-        self.issue_type = fetch_value(data, "issueType")
-        self.message = fetch_value(data, "message")
-        self.producing_target = fetch_value(data, "producingTarget")
-        self.document_location_in_creating_workspace = DocumentLocation.new(data["documentLocationInCreatingWorkspace"]) if data["documentLocationInCreatingWorkspace"]
-        super
-      end
-    end
-
-    # - ResultIssueSummaries
-    #   * Kind: object
-    #   * Properties:
-    #     + analyzerWarningSummaries: [IssueSummary]
-    #     + errorSummaries: [IssueSummary]
-    #     + testFailureSummaries: [TestFailureIssueSummary]
-    #     + warningSummaries: [IssueSummary]
-    class ResultIssueSummaries < AbstractObject
-      attr_accessor :analyzer_warning_summaries
-      attr_accessor :error_summaries
-      attr_accessor :test_failure_summaries
-      attr_accessor :warning_summaries
-      def initialize(data)
-        self.analyzer_warning_summaries = fetch_values(data, "analyzerWarningSummaries").map do |summary_data|
-          IssueSummary.new(summary_data)
-        end
-        self.error_summaries = fetch_values(data, "errorSummaries").map do |summary_data|
-          IssueSummary.new(summary_data)
-        end
-        self.test_failure_summaries = fetch_values(data, "testFailureSummaries").map do |summary_data|
-          TestFailureIssueSummary.new(summary_data)
         end
-        self.warning_summaries = fetch_values(data, "warningSummaries").map do |summary_data|
-          IssueSummary.new(summary_data)
-        end
-        super
-      end
-    end
 
-    # - TestFailureIssueSummary
-    #   * Supertype: IssueSummary
-    #   * Kind: object
-    #   * Properties:
-    #     + testCaseName: String
-    class TestFailureIssueSummary < IssueSummary
-      attr_accessor :test_case_name
-      def initialize(data)
-        self.test_case_name = fetch_value(data, "testCaseName")
-        super
-      end
+        private
 
-      def failure_message
-        new_message = self.message
-        if self.document_location_in_creating_workspace&.url
-          file_path = self.document_location_in_creating_workspace.url.gsub("file://", "")
-          new_message += " (#{file_path})"
+        def xcresult_to_json(path)
+          stdout, stderr, status = Open3.capture3('xcrun', 'xcresulttool', 'get', 'test-results', 'tests', '--path', path)
+          raise "Failed to execute xcresulttool command - #{stderr}" unless status.success?
+          JSON.parse(stdout)
         end
-
-        return new_message
       end
     end
   end

data/trainer/lib/trainer.rb

@@ -2,6 +2,8 @@ require 'fastlane'
 
 require 'trainer/options'
 require 'trainer/test_parser'
-require 'trainer/junit_generator'
 require 'trainer/xcresult'
+require 'trainer/junit_generator'
+require 'trainer/legacy_xcresult'
+require 'trainer/plist_test_summary_parser'
 require 'trainer/module'