test-unit-runner-junitxml 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 701cf2bc13f6f5c82a5907bfab0d37c4af45dad3
-  data.tar.gz: d49eab3c3dee6ed2b0b7559024368cff79917a83
+SHA256:
+  metadata.gz: dae7dcbf6a1e92a1f31dae3d428eb815a08a36374096a5936ff38eae7cd0cb7b
+  data.tar.gz: bffb5ed616dd1df0c7601a938839ce1cfaceaf2fdad1908cea1b506963ea11d1
 SHA512:
-  metadata.gz: 296147c324d43ebf138c1db60bf0f2b1f260e07a1a01fd42a62b0a80910ef643146c7476a9bda67be77d0f29e070d5f95d2792c68db236939aedafd30543f5e3
-  data.tar.gz: 14512b3671114d09568b8c97650d3a309f6e2ba332873e79a6f0ce56b0eecec7a4f6af21377fe967382bc8c9753087d70c78e00f8b415cb3cf6da4fe64d5a555
+  metadata.gz: fb431e6eb84b3baa5f2c834ec20376e86532747bdcf5dbe26d05748cfd3bc6d03bede34851cccf1baac239a1eb2f7d9169510560907ab5024d46ed43e4ad8784
+  data.tar.gz: e6f8db833e78bd128f6025dd631020e495a3511bf2ee9984ca050e7ef8bb4427289c7fdabe78a52c54af5fc491be6cc06390ea6414ff27e6cce8f72ab523b2a1

data/.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: '34 18 * * *'
+jobs:
+  rake-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [head, 3.1, 3.0, 2.7, 2.6, jruby, truffleruby]
+        exclude:
+          - os: windows-latest
+            ruby: jruby
+          - os: windows-latest
+            ruby: truffleruby
+    runs-on: ${{ matrix.os }}
+    # continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    # - run: bundle install
+    - if: matrix.ruby != 'jruby'
+      run: bundle exec rake test
+    - if: matrix.ruby == 'jruby'
+      run: bundle exec rake test TESTOPTS='--ignore-testcase=TestXmlMultibyteName'

data/.gitignore

@@ -1,8 +1,11 @@
 /.bundle/
+/.ruby-version
 /.yardoc
 /_yardoc/
+/Gemfile.lock
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

data/README.ja.md

@@ -0,0 +1,58 @@
+[[English](README.md)]
+
+[![Test](https://github.com/kenichiice/test-unit-runner-junitxml/workflows/Test/badge.svg)](https://github.com/kenichiice/test-unit-runner-junitxml/actions?query=workflow%3ATest+branch%3Amaster)
+
+# Test::Unit::Runner::JUnitXml
+
+Test::Unit::Runner::JUnitXml は [test-unit](https://github.com/test-unit/test-unit) のテスト結果をJUnit XML形式で出力するライブラリです。
+
+## インストール方法
+
+    $ gem install test-unit-runner-junitxml
+
+## 使い方
+
+`test/unit/runner/junitxml.rb` をロードすると、テストスクリプトの `--runner` オプションに `junitxml` を指定できるようになります。これを指定すると、テスト結果がJUnit XML形式で出力されるようになります。
+
+また、 `--junitxml-output-file` オプションも追加され、このオプションで指定したファイルにテスト結果を出力することができるようになります。
+
+```ruby
+# test.rb
+require "test/unit/runner/junitxml"
+
+class MyTest < Test::Unit::TestCase
+  def test_1
+    print("hello")
+    assert_equal(1, 2)
+  end
+end
+```
+
+```
+$ ruby test.rb --runner=junitxml --junitxml-output-file=result.xml
+$ cat result.xml
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuites>
+	<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.0037614">
+		<testcase classname="MyTest" name="test_1(MyTest)" file="test.rb" time="0.0036311" assertions="1">
+			<failure message="&lt;1&gt; expected but was
+&lt;2&gt;.">Failure:
+test_1(MyTest) [test.rb:7]:
+&lt;1&gt; expected but was
+&lt;2&gt;.</failure>
+			<system-out>hello</system-out>
+		</testcase>
+	</testsuite>
+</testsuites>
+```
+
+## オプション
+
+* --junitxml-output-file=FILE_NAME
+  * XMLを、標準出力ではなく指定したファイルへ出力します。
+* --junitxml-disable-output-capture
+  * 標準出力と標準エラー出力のキャプチャを行わないようになります。
+
+## ライセンス
+
+[MIT License](https://opensource.org/licenses/MIT)

data/README.md

@@ -1,5 +1,58 @@
+[[日本語](README.ja.md)]
+
+[![Test](https://github.com/kenichiice/test-unit-runner-junitxml/workflows/Test/badge.svg)](https://github.com/kenichiice/test-unit-runner-junitxml/actions?query=workflow%3ATest+branch%3Amaster)
+
 # Test::Unit::Runner::JUnitXml
 
-[![Build Status](https://travis-ci.org/kenichiice/test-unit-runner-junitxml.svg?branch=master)](https://travis-ci.org/kenichiice/test-unit-runner-junitxml)
+Test::Unit::Runner::JUnitXml is a [test-unit](https://github.com/test-unit/test-unit) runner that reports test result in JUnit XML format.
+
+## Installation
+
+    $ gem install test-unit-runner-junitxml
+
+## Usage
+
+By loading `test/unit/runner/junitxml.rb`, you can select `junitxml` runner via the `--runner` command line option of test script. This runner reports test result in JUnit XML format.
+
+In addition, `--junitxml-output-file` command line option is added, and it becomes possible to output the test result to the file specified by this option.
+
+```ruby
+# test.rb
+require "test/unit/runner/junitxml"
+
+class MyTest < Test::Unit::TestCase
+  def test_1
+    print("hello")
+    assert_equal(1, 2)
+  end
+end
+```
+
+```
+$ ruby test.rb --runner=junitxml --junitxml-output-file=result.xml
+$ cat result.xml
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuites>
+	<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.0037614">
+		<testcase classname="MyTest" name="test_1(MyTest)" file="test.rb" time="0.0036311" assertions="1">
+			<failure message="&lt;1&gt; expected but was
+&lt;2&gt;.">Failure:
+test_1(MyTest) [test.rb:7]:
+&lt;1&gt; expected but was
+&lt;2&gt;.</failure>
+			<system-out>hello</system-out>
+		</testcase>
+	</testsuite>
+</testsuites>
+```
+
+## Options
+
+* --junitxml-output-file=FILE_NAME
+  * Output XML to the specified file instead of the standard output.
+* --junitxml-disable-output-capture
+  * Disable capture of standard output and standard error.
+
+## License
 
-WIP
+[MIT License](https://opensource.org/licenses/MIT)

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
 
-task :default => :test
-
-desc "run unit tests"
-task :test do
-    ruby("test/run-test.rb")
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.test_files = FileList['test/**/test*.rb']
 end
+
+task :default => :test

data/lib/test/unit/runner/junitxml/version.rb

@@ -2,7 +2,7 @@ module Test
   module Unit
     module Runner
       module Junitxml
-        VERSION = "0.1.0"
+        VERSION = "0.3.0"
       end
     end
   end

data/lib/test/unit/runner/junitxml.rb

@@ -12,6 +12,10 @@ module Test
               "Outputs to FILE_NAME") do |name|
         auto_runner.runner_options[:junitxml_output_file] = name
       end
+      opts.on("--junitxml-disable-output-capture",
+              "Disable output capture") do |b|
+        auto_runner.runner_options[:junitxml_disable_output_capture] = b
+      end
     end
   end
 end

data/lib/test/unit/ui/junitxml/testrunner.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'stringio'
 require 'test/unit/ui/testrunner'
 require 'test/unit/ui/testrunnermediator'
 
@@ -14,6 +15,7 @@ module Test
           def initialize(suite, options={})
             super
             @junit_test_suites = []
+            @base_dir_re = /\A#{Regexp.quote(Dir.pwd)}\//
           end
 
           private
@@ -48,12 +50,28 @@ module Test
           end
 
           def test_started(test)
-            @junit_test_suites.last << JUnitTestCase.new(test.class.name,
-                                                         test.description)
+            test_case = JUnitTestCase.new(test.class.name, test.description, test_file(test))
+            @junit_test_suites.last << test_case
+            unless @options[:junitxml_disable_output_capture]
+              @stdout_org = $stdout
+              @stderr_org = $stderr
+              $stdout = test_case.stdout
+              $stderr = test_case.stderr
+            end
+          end
+
+          def test_file(test)
+            file = (test[:source_location] ||
+                    test.method(test.method_name).source_location).first
+            file.sub(@base_dir_re, "")
           end
 
           def test_finished(test)
             @junit_test_suites.last.test_cases.last.time = test.elapsed_time
+            unless @options[:junitxml_disable_output_capture]
+              $stdout = @stdout_org
+              $stderr = @stderr_org
+            end
           end
 
           def result_pass_assertion(result)
@@ -114,17 +132,20 @@ module Test
         end
 
         class JUnitTestCase
-          attr_reader :class_name, :name
+          attr_reader :class_name, :name, :file
           attr_reader :failure, :error, :omission, :pending
+          attr_reader :stdout, :stderr
           attr_accessor :assertion_count, :time
 
-          def initialize(class_name, name)
+          def initialize(class_name, name, file)
             @class_name = class_name
             @name = name
+            @file = file
+            @failure = @error = @omission = @pending = nil
+            @stdout = StringIO.new
+            @stderr = StringIO.new
             @assertion_count = 0
             @time = 0
-            @omission = nil
-            @pending = nil
           end
 
           def <<(fault)

data/lib/test/unit/ui/junitxml/xml.erb

@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuites>
 % @junit_test_suites.each do |test_suite|
-  <testsuite name="<%=h test_suite.name %>"
-             tests="<%=h test_suite.test_cases.size %>"
-             errors="<%=h test_suite.errors.size %>"
-             failures="<%=h test_suite.failures.size %>"
-             skipped="<%=h test_suite.test_cases.count(&:skipped?) %>"
-             time="<%=h test_suite.time %>">
-%   test_suite.test_cases.each do |test_case|
-    <testcase classname="<%=h test_case.class_name %>"
-              name="<%=h test_case.name %>"
-              time="<%=h test_case.time %>"
-              assertions="<%=h test_case.assertion_count %>">
-%     if test_case.error
-      <error message="<%=h test_case.error.message %>"
-             type="<%=h test_case.error.exception.class.name %>">
-<%=h test_case.error.long_display %>
-      </error>
-%     elsif test_case.failure
-      <failure message="<%=h test_case.failure.message %>">
-<%=h test_case.failure.long_display %>
-      </failure>
-%     elsif test_case.omission
-      <skipped message="<%=h test_case.omission.message %>"/>
-%     elsif test_case.pending
-      <skipped message="<%=h test_case.pending.message %>"/>
-%     end
-    </testcase>
-%   end
-  </testsuite>
+	<testsuite name="<%=h test_suite.name %>" tests="<%=h test_suite.test_cases.size %>" errors="<%=h test_suite.errors.size %>" failures="<%=h test_suite.failures.size %>" skipped="<%=h test_suite.test_cases.count(&:skipped?) %>" time="<%=h test_suite.time %>">
+%	test_suite.test_cases.each do |test_case|
+		<testcase classname="<%=h test_case.class_name %>" name="<%=h test_case.name %>" file="<%=h test_case.file%>" time="<%=h test_case.time %>" assertions="<%=h test_case.assertion_count %>">
+%		if test_case.error
+			<error message="<%=h test_case.error.message %>" type="<%=h test_case.error.exception.class.name %>"><%=h test_case.error.long_display %></error>
+%		elsif test_case.failure
+			<failure message="<%=h test_case.failure.message %>"><%=h test_case.failure.long_display %></failure>
+%		elsif test_case.omission
+			<skipped message="<%=h test_case.omission.message %>"/>
+%		elsif test_case.pending
+			<skipped message="<%=h test_case.pending.message %>"/>
+%		end
+%		if test_case.stdout.size > 0
+			<system-out><%=h test_case.stdout.string %></system-out>
+%		end
+%		if test_case.stderr.size > 0
+			<system-err><%=h test_case.stderr.string %></system-err>
+%		end
+		</testcase>
+%	end
+	</testsuite>
 % end
 </testsuites>

data/test-unit-runner-junitxml.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "test/unit/runner/junitxml/version"
@@ -11,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A test-unit runner that reports test result in JUnit XML format.}
   #spec.description   = %q{TODO: Write a longer description or delete this line.}
-  #spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.homepage      = "https://github.com/kenichiice/test-unit-runner-junitxml"
   spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.
@@ -23,8 +22,9 @@ Gem::Specification.new do |spec|
   #spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rexml"
 
-  spec.add_runtime_dependency "test-unit", "~> 3.0"
+  spec.add_runtime_dependency "test-unit"
 end

metadata

@@ -1,68 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: test-unit-runner-junitxml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - OGAWA KenIchi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
+        version: '0'
+description:
 email:
 - kenichi@ice.email.ne.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- README.ja.md
 - README.md
 - Rakefile
 - lib/test/unit/runner/junitxml.rb
@@ -70,11 +85,11 @@ files:
 - lib/test/unit/ui/junitxml/testrunner.rb
 - lib/test/unit/ui/junitxml/xml.erb
 - test-unit-runner-junitxml.gemspec
-homepage: 
+homepage: https://github.com/kenichiice/test-unit-runner-junitxml
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A test-unit runner that reports test result in JUnit XML format.
 test_files: []

data/.travis.yml

@@ -1,14 +0,0 @@
----
-sudo: false
-dist: xenial
-language: ruby
-cache: bundler
-rvm:
-  - ruby-head
-  - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
-
-before_install:
-  - gem update bundler