refactor: reconfigure the tests

Author: kenichiice

.github/workflows/test.yml

@@ -32,4 +32,4 @@ jobs:
     - if: matrix.ruby != 'jruby'
       run: bundle exec rake test
     - if: matrix.ruby == 'jruby'
-      run: bundle exec rake test TESTOPTS='--ignore-name=/multibyte/'
+      run: bundle exec rake test TESTOPTS='--ignore-testcase=TestXmlMultibyteName'

test/check.rb

@@ -0,0 +1,71 @@
+require "test/unit/assertions"
+
+module Check
+  def check_testsuite(testsuite, name, tests, errors, failures, skipped)
+    assert_equal(name, testsuite.attribute("name").value)
+    assert_equal(tests, testsuite.get_elements("testcase").size)
+    assert_equal(tests.to_s, testsuite.attribute("tests").value)
+    assert_equal(errors.to_s, testsuite.attribute("errors").value)
+    assert_equal(failures.to_s, testsuite.attribute("failures").value)
+    assert_equal(skipped.to_s, testsuite.attribute("skipped").value)
+    assert_compare(0, "<", Float(testsuite.attribute("time").value))
+  end
+
+  def check_testcase_success(testcase, class_name, assertions)
+    assert_equal(class_name, testcase.attribute("classname").value)
+    assert_equal(assertions.to_s, testcase.attribute("assertions").value)
+    assert_compare(0, "<", Float(testcase.attribute("time").value))
+
+    assert_equal(0, testcase.get_elements("failure").size)
+    assert_equal(0, testcase.get_elements("error").size)
+    assert_equal(0, testcase.get_elements("skipped").size)
+  end
+
+  def check_testcase_failure(testcase, class_name, assertions, message = nil)
+    assert_equal(class_name, testcase.attribute("classname").value)
+    assert_equal(assertions.to_s, testcase.attribute("assertions").value)
+    assert_compare(0, "<", Float(testcase.attribute("time").value))
+
+    failures = testcase.get_elements("failure")
+    assert_equal(1, failures.size)
+    assert_true(failures.first.has_text?)
+    if message
+      assert_match(message, failures.first.attribute("message").value)
+      assert_match(message, failures.first.text)
+    end
+
+    assert_equal(0, testcase.get_elements("error").size)
+    assert_equal(0, testcase.get_elements("skipped").size)
+  end
+
+  def check_testcase_error(testcase, class_name, assertions, message = nil)
+    assert_equal(class_name, testcase.attribute("classname").value)
+    assert_equal(assertions.to_s, testcase.attribute("assertions").value)
+    assert_compare(0, "<", Float(testcase.attribute("time").value))
+
+    errors = testcase.get_elements("error")
+    assert_equal(1, errors.size)
+    assert_not_nil(errors.first.attribute("type"))
+    assert_true(errors.first.has_text?)
+    if message
+      assert_match(message, errors.first.attribute("message").value)
+      assert_match(message, errors.first.text)
+    end
+
+    assert_equal(0, testcase.get_elements("failure").size)
+    assert_equal(0, testcase.get_elements("skipped").size)
+  end
+
+  def check_testcase_skipped(testcase, class_name, assertions, message = nil)
+    assert_equal(class_name, testcase.attribute("classname").value)
+    assert_equal(assertions.to_s, testcase.attribute("assertions").value)
+    assert_compare(0, "<", Float(testcase.attribute("time").value))
+
+    skipped = testcase.get_elements("skipped")
+    assert_equal(1, skipped.size)
+    assert_match(message, skipped.first.attribute("message").value) if message
+
+    assert_equal(0, testcase.get_elements("failure").size)
+    assert_equal(0, testcase.get_elements("error").size)
+  end
+end

test/run-test.rb

@@ -10,6 +10,7 @@
 $LOAD_PATH.unshift(lib_dir)
 
 require 'test-unit'
+require 'test/unit/runner/junitxml'
 
 test_unit_notify_base_dir = File.join(base_dir, "..", "test-unit-notify")
 test_unit_notify_base_dir = File.expand_path(test_unit_notify_base_dir)

test/test_xml.rb

@@ -2,186 +2,90 @@
 require 'rexml/document'
 require "test/unit"
 require "test/unit/ui/junitxml/testrunner"
+require_relative "check"
 
-module Test
-  module Unit
-    module UI
-      module JUnitXml
-        class TestXml < Test::Unit::TestCase
+class TestXml < Test::Unit::TestCase
+  include Check
 
-          def test_1
-            test_case = Class.new(Test::Unit::TestCase) do
-              test "success" do
-                assert_equal(1, 1)
-              end
-
-              def test_failure
-                assert_equal(1, 2)
-              end
-
-              def test_error
-                raise "hello"
-              end
-
-              def test_omission
-                omit
-              end
-
-              def test_pending
-                pend
-              end
-            end
-
-            output = StringIO.new
-            runner = TestRunner.new(test_case.suite, :output => output)
-            runner.start
-
-            output.rewind
-            doc = REXML::Document.new(output)
-
-            testsuites = doc.get_elements("testsuites")
-            assert_equal(1, testsuites.size)
-            testsuite_array = testsuites.first.get_elements("testsuite")
-            assert_equal(1, testsuite_array.size)
-            testsuite = testsuite_array.first
-            check_testsuite(testsuite, "", 5, 1, 1, 2)
-
-            check_testcase_success(
-              testsuite.elements["testcase[@name='success']"],
-              "", 1)
-            check_testcase_failure(
-              testsuite.elements["testcase[@name='test_failure()']"],
-              "", 1)
-            check_testcase_error(
-              testsuite.elements["testcase[@name='test_error()']"],
-              "", 0)
-            check_testcase_skipped(
-              testsuite.elements["testcase[@name='test_omission()']"],
-              "", 0)
-            check_testcase_skipped(
-              testsuite.elements["testcase[@name='test_pending()']"],
-              "", 0)
-          end
-
-          def test_multibyte_text
-            test_case = Class.new(Test::Unit::TestCase) do
-              test "成功" do
-                assert_equal(1, 1)
-              end
-
-              def test_failure
-                assert_equal(1, 2, "失敗")
-              end
-
-              def test_error
-                raise "エラー"
-              end
-
-              def test_omission
-                omit("除外")
-              end
-
-              def test_pending
-                pend("保留")
-              end
-            end
-
-            output = StringIO.new
-            runner = TestRunner.new(test_case.suite, :output => output)
-            runner.start
-
-            output.rewind
-            doc = REXML::Document.new(output)
-
-            testsuites = doc.get_elements("testsuites")
-            assert_equal(1, testsuites.size)
-            testsuite_array = testsuites.first.get_elements("testsuite")
-            assert_equal(1, testsuite_array.size)
-            testsuite = testsuite_array.first
-            check_testsuite(testsuite, "", 5, 1, 1, 2)
-
-            check_testcase_success(
-              testsuite.elements["testcase[@name='成功']"],
-              "", 1)
-            check_testcase_failure(
-              testsuite.elements["testcase[@name='test_failure()']"],
-              "", 1, "失敗")
-            check_testcase_error(
-              testsuite.elements["testcase[@name='test_error()']"],
-              "", 0, "エラー")
-            check_testcase_skipped(
-              testsuite.elements["testcase[@name='test_omission()']"],
-              "", 0, "除外")
-            check_testcase_skipped(
-              testsuite.elements["testcase[@name='test_pending()']"],
-              "", 0, "保留")
-          end
+  setup do
+    test_case = Class.new(Test::Unit::TestCase) do
+      test "success" do
+        assert_equal(1, 1)
+      end
 
-          private
+      def test_failure
+        assert_equal(1, 1)
+        assert_equal(1, 2)
+      end
 
-          def check_testsuite(testsuite, name, tests, errors, failures, skipped)
-            assert_equal(name, testsuite.attribute("name").value)
-            assert_equal(tests, testsuite.get_elements("testcase").size)
-            assert_equal(tests.to_s, testsuite.attribute("tests").value)
-            assert_equal(errors.to_s, testsuite.attribute("errors").value)
-            assert_equal(failures.to_s, testsuite.attribute("failures").value)
-            assert_equal(skipped.to_s, testsuite.attribute("skipped").value)
-            assert_compare(0, "<", Float(testsuite.attribute("time").value))
-          end
+      def test_error
+        assert_equal(1, 1)
+        assert_equal(1, 1)
+        assert_equal(1, 1)
+        raise "hello"
+      end
 
-          def check_testcase_success(testcase, class_name, assertions)
-            assert_equal(class_name, testcase.attribute("classname").value)
-            assert_equal(assertions.to_s, testcase.attribute("assertions").value)
-            assert_compare(0, "<", Float(testcase.attribute("time").value))
+      def test_omission
+        omit
+      end
 
-            assert_equal(0, testcase.get_elements("failure").size)
-            assert_equal(0, testcase.get_elements("error").size)
-            assert_equal(0, testcase.get_elements("skipped").size)
-          end
+      def test_pending
+        pend
+      end
+    end
 
-          def check_testcase_failure(testcase, class_name, assertions, message = nil)
-            assert_equal(class_name, testcase.attribute("classname").value)
-            assert_equal(assertions.to_s, testcase.attribute("assertions").value)
-            assert_compare(0, "<", Float(testcase.attribute("time").value))
+    output = StringIO.new
+    runner = Test::Unit::UI::JUnitXml::TestRunner.new(
+      test_case.suite, :output => output)
+    runner.start
 
-            failures = testcase.get_elements("failure")
-            assert_equal(1, failures.size)
-            assert_match(message, failures.first.attribute("message").to_s) if message
-            assert_true(failures.first.has_text?)
+    output.rewind
+    @doc = REXML::Document.new(output)
+  end
 
-            assert_equal(0, testcase.get_elements("error").size)
-            assert_equal(0, testcase.get_elements("skipped").size)
-          end
+  test "testsuites" do
+    testsuites_array = @doc.get_elements("/testsuites")
+    assert_equal(1, testsuites_array.size)
+  end
 
-          def check_testcase_error(testcase, class_name, assertions, message = nil)
-            assert_equal(class_name, testcase.attribute("classname").value)
-            assert_equal(assertions.to_s, testcase.attribute("assertions").value)
-            assert_compare(0, "<", Float(testcase.attribute("time").value))
+  test "testsuite" do
+    testsuite_array = @doc.get_elements("/testsuites/testsuite")
+    assert_equal(1, testsuite_array.size)
+    check_testsuite(testsuite_array.first, "", 5, 1, 1, 2)
+  end
 
-            errors = testcase.get_elements("error")
-            assert_equal(1, errors.size)
-            assert_match(message, errors.first.attribute("message").to_s) if message
-            assert_not_nil(errors.first.attribute("type"))
-            assert_true(errors.first.has_text?)
+  test "testcase success" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='success']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_success(testcase_array.first, "", 1)
+  end
 
-            assert_equal(0, testcase.get_elements("failure").size)
-            assert_equal(0, testcase.get_elements("skipped").size)
-          end
+  test "testcase failure" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_failure()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_failure(testcase_array.first, "", 2)
+  end
 
-          def check_testcase_skipped(testcase, class_name, assertions, message = nil)
-            assert_equal(class_name, testcase.attribute("classname").value)
-            assert_equal(assertions.to_s, testcase.attribute("assertions").value)
-            assert_compare(0, "<", Float(testcase.attribute("time").value))
+  test "testcase error" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_error()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_error(testcase_array.first, "", 3, "hello")
+  end
 
-            failures = testcase.get_elements("skipped")
-            assert_equal(1, failures.size)
-            assert_match(message, failures.first.attribute("message").to_s) if message
+  test "testcase omission" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_omission()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_skipped(testcase_array.first, "", 0)
+  end
 
-            assert_equal(0, testcase.get_elements("failure").size)
-            assert_equal(0, testcase.get_elements("error").size)
-          end
-        end
-      end
-    end
+  test "testcase pending" do
+    testcase_array = @doc.get_elements(
+      "/testsuites/testsuite/testcase[@name='test_pending()']")
+    assert_equal(1, testcase_array.size)
+    check_testcase_skipped(testcase_array.first, "", 0)
   end
 end