fastlane-plugin-test_center 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa0a9fe29d653e795cea77a0bd9ebd3b5b7bd31
-  data.tar.gz: 51e8b46c2f583e5671e4714b908af491536f255e
+  metadata.gz: a64f4a3e425bf54d6af1be29d1d469cf23583b1d
+  data.tar.gz: 317d1a0570db66453b52472d8579b7a32fb08c84
 SHA512:
-  metadata.gz: 68701ec0319d7b57002072cff6417479983f51be0f9ab5d369c35caf64418807335116c005ae2b8f3598bf285038c716b33bac9cebd9da23013556edce804df7
-  data.tar.gz: bbf9fe27feacb12076c1aed2315f9f7f5fdbf52dbb7af3d61defa56cc053ef2716b7bd446cb0b5079669638609f88539b1ee7655e46643c6dd20b5857930b8b2
+  metadata.gz: fd94cba9b112713bf4dc445a64b623081f4ebfd59f97e607c0240c4c771983acd78896dfb379314c9fecd62b07ac6320f61dab54eba8efaeade55eff27b6e848
+  data.tar.gz: 788604b0ddc8f88a3f00b83d2c03f0084e1efda670fdb4c0b46db3796487b5a9047411314767aaf82a488f98b644531f0d873ec7d7dae76e9f627f4938d57762

data/README.md

@@ -23,6 +23,7 @@ This fastlane plugin includes the following actions:
 - `suppress_tests`: suppresses specific tests in a specific or all Xcode Schemes in a given project
 - `suppressed_tests`: retrieves a list of tests that are suppressed in a specific or all Xcode Schemes in a project
 - `tests_from_junit`: retrieves the failing and passing tests as reported in a junit xml file
+- `collate_junit_reports`: collects and correctly organizes junit reports from multiple test passes
 
 ## Example
 

data/lib/fastlane/plugin/test_center/actions/collate_junit_reports.rb

@@ -0,0 +1,134 @@
+require 'pry-byebug'
+module Fastlane
+  module Actions
+    class CollateJunitReportsAction < Action
+      def self.run(params)
+        report_filepaths = params[:reports]
+        if report_filepaths.size == 1
+          FileUtils.cp(report_filepaths[0], params[:collated_report])
+        else
+          reports = report_filepaths.map { |report_filepath| REXML::Document.new(File.new(report_filepath)) }
+
+          # copy any missing testsuites
+          target_report = reports.shift
+          reports.each do |report|
+            report.elements.each('//testsuite') do |testsuite|
+              testsuite_name = testsuite.attributes['name']
+
+              target_testsuite = REXML::XPath.first(target_report, "//testsuite[@name='#{testsuite_name}']")
+              if target_testsuite
+                testsuite.elements.each('testcase') do |testcase|
+                  classname = testcase.attributes['classname']
+                  name = testcase.attributes['name']
+                  target_testcase = REXML::XPath.first(target_testsuite, "testcase[@name='#{name}' and @classname='#{classname}']")
+                  # Replace target_testcase with testcase
+                  if target_testcase
+                    target_testcase.parent.insert_after(target_testcase, testcase)
+                    target_testcase.parent.delete_element(target_testcase)
+                  end
+                end
+              else
+                testable = REXML::XPath.first(target_report, "//testsuites")
+                testable << testsuite
+              end
+            end
+          end
+          target_report.elements.each('//testsuite') do |testsuite|
+            update_testsuite_counts(testsuite)
+          end
+          testable = REXML::XPath.first(target_report, 'testsuites')
+          update_testable_counts(testable)
+
+          FileUtils.mkdir_p(File.dirname(params[:collated_report]))
+          File.open(params[:collated_report], 'w') do |f|
+            target_report.write(f, 2)
+          end
+        end
+      end
+
+      def self.update_testable_counts(testable)
+        testsuites = REXML::XPath.match(testable, 'testsuite')
+        test_count = 0
+        failure_count = 0
+        testsuites.each do |testsuite|
+          test_count += testsuite.attributes['tests'].to_i
+          failure_count += testsuite.attributes['failures'].to_i
+        end
+        testable.attributes['tests'] = test_count.to_s
+        testable.attributes['failures'] = failure_count.to_s
+      end
+
+      def self.update_testsuite_counts(testsuite)
+        testcases = REXML::XPath.match(testsuite, 'testcase')
+        testsuite.attributes['tests'] = testcases.size.to_s
+        failure_count = testcases.reduce(0) do |count, testcase|
+          if REXML::XPath.first(testcase, 'failure')
+            count += 1
+          end
+          count
+        end
+        testsuite.attributes['failures'] = failure_count.to_s
+      end
+
+      def self.attribute_sum_string(node1, node2, attribute)
+        value1 = node1.attributes[attribute].to_i
+        value2 = node2.attributes[attribute].to_i
+        (value1 + value2).to_s
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Combines and combines tests from multiple junit report files"
+      end
+
+      def self.details
+        "The first junit report is used as the base report. Testcases " \
+        "from other reports are added if they do not already exist, or " \
+        "if the testcases already exist, they are replaced." \
+        "" \
+        "This is done because it is assumed that fragile tests, when " \
+        "re-run will often succeed due to less interference from other " \
+        "tests and the subsequent junit reports will have more passed tests." \
+        "" \
+        "Inspired by Derek Yang's fastlane-plugin-merge_junit_report"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :reports,
+            env_name: 'COLLATE_JUNIT_REPORTS_REPORTS',
+            description: 'An array of junit reports to collate. The first report is used as the base into which other reports are merged in',
+            optional: false,
+            type: Array,
+            verify_block: proc do |reports|
+              UI.user_error!('No junit report files found') if reports.empty?
+              reports.each do |report|
+                UI.user_error!("Error: junit report not found: '#{report}'") unless File.exist?(report)
+              end
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :collated_report,
+            env_name: 'COLLATE_JUNIT_REPORTS_COLLATED_REPORT',
+            description: 'The final junit report file where all testcases will be merged into',
+            optional: true,
+            default_value: 'result.xml',
+            type: String
+          )
+        ]
+      end
+
+      def self.authors
+        ["lyndsey-ferguson/@lyndseydf"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/test_center/actions/multi_scan.rb

@@ -1,7 +1,6 @@
 module Fastlane
   module Actions
     require 'fastlane/actions/scan'
-    require 'fastlane/plugin/merge_junit_report'
     require 'shellwords'
 
     class MultiScanAction < Action
@@ -53,9 +52,9 @@ module Fastlane
           if match
             final_report_name = "#{match[:filename]}#{extension}"
           end
-          other_action.merge_junit_report(
-            input_files: report_files.reverse,
-            output_file: File.absolute_path(File.join(scan_options[:output_directory], final_report_name))
+          other_action.collate_junit_reports(
+            reports: report_files.reverse,
+            collated_report: File.absolute_path(File.join(scan_options[:output_directory], final_report_name))
           )
         end
         FileUtils.rm_f(Dir.glob("#{scan_options[:output_directory]}/*-[1-9]*#{extension}"))

data/lib/fastlane/plugin/test_center/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "2.2.1"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fastlane-plugin-merge_junit_report
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +143,7 @@ description: |2
       3) suppress_tests: suppresses specific tests in a specific or all Xcode Schemes in a given project.
       4) suppressed_tests: retrieves a list of tests that are suppressed in a specific or all Xcode Schemes in a project.
       5) tests_from_junit: retrieves the failing and passing tests as reported in a junit xml file.
+      6) collate_junit_reports: collects and correctly organizes junit reports from multiple test passes.
 email: ldf.public+github@outlook.com
 executables: []
 extensions: []
@@ -165,6 +152,7 @@ files:
 - LICENSE
 - README.md
 - lib/fastlane/plugin/test_center.rb
+- lib/fastlane/plugin/test_center/actions/collate_junit_reports.rb
 - lib/fastlane/plugin/test_center/actions/multi_scan.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests_from_junit.rb