minitest-junit 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee1107bc68ec72b4bd9472bc262f60de897b404f4fc41bf819d366655217ca0
-  data.tar.gz: edff04e8a7625631e4253eda27fb2b6e7bbad68e64a63af81cc764e807bd83b8
+  metadata.gz: 4e9e6fe53a55b11d36289c47953e13279e41afff916cb27a7161d64baa61d914
+  data.tar.gz: 9311c1d71be9be105f06c0f035bd8411e74f7c3a468d77e85a9cca34b11097f7
 SHA512:
-  metadata.gz: 9e53812e887116df0a408dba93453f81cc32bd40f909bd52b9f4daf4c15f64bc632bfd340920e3f9ac4ad3642df3797722be6334a7b7e951b5a3f3304e626c30
-  data.tar.gz: 2b94a3901ea1fe4c51a2a37fa7f76d120aa8335bd9f23a8319d5a78f40f970709f3573d63d92c2d992c13485e4b4c17ac50355d0a400d10c70eabd3897b94c29
+  metadata.gz: 5fd510f4009f0c504c3d7c75f8dc8c217c61a895c92fabb912908d20ccfdfb63454152cf56257e5deb16ae499244505bfbbae768a26b9894650f1a8fa0733d9c
+  data.tar.gz: d47bf2f92fb7a8814be1a4337826cbe4e0cb803ac8f6d0a55e285b2a77e3ae642f7f2c597127300f080f25305d887b5a433da6e1906ff81dcca64d4d9734d18a

data/lib/minitest/junit/version.rb

@@ -1,6 +1,6 @@
 module Minitest
   # :nodoc:
   module Junit
-    VERSION = '0.3.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/minitest/junit.rb

@@ -1,6 +1,8 @@
 require 'minitest/junit/version'
 require 'minitest'
 require 'builder'
+require 'socket'
+require 'time'
 
 # :nodoc:
 module Minitest
@@ -11,6 +13,8 @@ module Minitest
         @io = io
         @results = []
         @options = options
+        @options[:timestamp] = options.fetch(:timestamp, Time.now.iso8601)
+        @options[:hostname] = options.fetch(:hostname, Socket.gethostname)
       end
 
       def passed?
@@ -24,15 +28,26 @@ module Minitest
       end
 
       def report
-        @io.puts '<testsuite>'
-        @results.each { |result| @io.puts format(result) }
-        @io.puts '</testsuite>'
+        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml.testsuite(name: 'minitest',
+                      timestamp: @options[:timestamp],
+                      hostname: @options[:hostname],
+                      tests: @results.count,
+                      skipped: @results.count { |result| result.skipped? },
+                      failures: @results.count { |result| !result.error? && result.failure },
+                      errors: @results.count { |result| result.error? },
+                      time: format_time(@results.inject(0) { |a, e| a += e.time })) do
+                        @results.each { |result| format(result, xml) }
+                      end
+        @io.puts xml.target!
       end
 
-      def format(result)
-        xml = Builder::XmlMarkup.new
-        xml.testcase classname: format_class(result), name: format_name(result),
-                     time: result.time, assertions: result.assertions do |t|
+      def format(result, parent = nil)
+        xml = Builder::XmlMarkup.new(:target => parent, :indent => 2)
+        xml.testcase classname: format_class(result),
+                     name: format_name(result),
+                     time: format_time(result.time),
+                     assertions: result.assertions do |t|
           if result.skipped?
             t.skipped message: result
           else
@@ -42,7 +57,7 @@ module Minitest
             end
           end
         end
-        xml.target!
+        xml
       end
 
       private
@@ -61,15 +76,19 @@ module Minitest
 
       def format_class(result)
         if @options[:junit_jenkins]
-          result.class.to_s.gsub(/(.*)::(.*)/, '\1.\2')
+          result.klass.to_s.gsub(/(.*)::(.*)/, '\1.\2')
         else
-          result.class
+          result.klass
         end
       end
 
       def format_name(result)
         result.name
       end
+
+      def format_time(time)
+        Kernel::format('%.6f', time)
+      end
     end
   end
 end

data/minitest-junit.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test)\//)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'minitest', '~> 5.0'
+  spec.add_dependency 'minitest', '~> 5.11'
   spec.add_dependency 'builder', '~> 3.2'
 
   spec.add_development_dependency 'bundler'

data/test/reporter_test.rb

@@ -1,4 +1,5 @@
 require 'minitest/autorun'
+require 'builder'
 require 'stringio'
 require 'time'
 
@@ -10,34 +11,68 @@ class ReporterTest < Minitest::Test
 
     reporter.report
 
-    assert_equal "<testsuite>\n</testsuite>\n", reporter.output
+    assert_match(/^<testsuite name="minitest" timestamp="[^"]+" hostname="[^"]+" tests="0" skipped="0" failures="0" errors="0" time="0.000000">\n<\/testsuite>\n$/, reporter.output)
   end
 
-  def test_formats_each_result_with_a_formatter
+  def test_formats_each_successful_result_with_a_formatter
     reporter = create_reporter
-    results = rand(100).times.map do |i|
-      result = "test_name#{i}"
+
+    results = do_formatting_test(reporter, count: rand(100), cause_failures: 0)
+
+    results.each do |result|
+      assert_match("<testcase classname=\"FakeTestName\" name=\"#{result.name}\"", reporter.output)
+    end
+  end
+
+  def test_formats_each_failed_result_with_a_formatter
+    reporter = create_reporter
+
+    results = do_formatting_test(reporter, count: rand(100), cause_failures: 1)
+
+    results.each do |result|
+      assert_match("<testcase classname=\"FakeTestName\" name=\"#{result.name}\"", reporter.output)
+      assert_match(/<failure/, reporter.output)
+    end
+  end
+
+  private
+
+  def do_formatting_test(reporter, count: 1, cause_failures: 0)
+    results = count.times.map do |i|
+      result = create_test_result(methodname: "test_name#{i}", failures: cause_failures)
       reporter.record result
       result
     end
 
     reporter.report
 
-    expected = "<testsuite>\n#{results.join "\n"}\n</testsuite>\n"
-    assert_equal expected, reporter.output
+    results
   end
 
-  private
+  def create_test_result(name: FakeTestName, methodname: 'test_method_name', successes: 1, failures: 0)
+    test = Class.new Minitest::Test do
+      define_method 'class' do
+        name
+      end
+    end.new methodname
+    test.time = rand(100)
+    test.assertions = successes + failures
+    test.failures = failures.times.map do |i|
+      Class.new Minitest::Assertion do
+        define_method 'backtrace' do
+          ["Model failure \##{i}", 'This is a test backtrace']
+        end
+      end.new
+    end
+    Minitest::Result.from test
+  end
 
-  def create_reporter
-    io = StringIO.new
-    reporter = Minitest::Junit::Reporter.new io, {}
+  def create_reporter(options = {})
+    io = StringIO.new ''
+    reporter = Minitest::Junit::Reporter.new io, options
     def reporter.output
       @io.string
     end
-    def reporter.format(result)
-      result
-    end
     reporter.start
     reporter
   end

data/test/testcase_formatter_test.rb

@@ -4,12 +4,20 @@ require 'time'
 
 require 'minitest/junit'
 
+class FakeTestName; end
+
+module FirstModule
+  module SecondModule
+    class TestClass; end
+  end
+end
+
 class TestCaseFormatter < Minitest::Test
   def test_all_tests_generate_testcase_tag
     test = create_test_result
     reporter = create_reporter
 
-    assert_match test.name, reporter.format(test)
+    assert_match test.name, reporter.format(test).target!
   end
 
   def test_skipped_tests_generates_skipped_tag
@@ -20,7 +28,7 @@ class TestCaseFormatter < Minitest::Test
 
     reporter.report
 
-    assert_match(/<skipped message="[^<>]+"\/><\/testcase>\n<\/testsuite>\n/, reporter.output)
+    assert_match(/<skipped message="[^<>]+"\/>\n<\/testcase>\n<\/testsuite>\n/, reporter.output)
   end
 
   def test_failing_tests_creates_failure_tag
@@ -46,7 +54,7 @@ class TestCaseFormatter < Minitest::Test
   end
 
   def test_jenkins_sanitizer_uses_modules_as_packages
-    test = create_test_result 'FirstModule::SecondModule::TestClass'
+    test = create_test_result FirstModule::SecondModule::TestClass
     reporter = create_reporter junit_jenkins: true
     reporter.record test
 
@@ -63,7 +71,7 @@ class TestCaseFormatter < Minitest::Test
     e
   end
 
-  def create_test_result(name = 'ATestClass')
+  def create_test_result(name = FakeTestName)
     test = Class.new Minitest::Test do
       define_method 'class' do
         name
@@ -71,7 +79,7 @@ class TestCaseFormatter < Minitest::Test
     end.new 'test_method_name'
     test.time = a_number
     test.assertions = a_number
-    test
+    Minitest::Result.from test
   end
 
   def a_number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-junit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Allan Espinosa
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement