summaryrefslogtreecommitdiff
path: root/tool/test
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2021-09-09 14:26:57 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-09-11 08:48:03 +0900
commitad979a5e00996881a06a5863a607009ed7e13320 (patch)
tree83f42d255a3aa0e9e444dc1a1c0a5d51a37bddfe /tool/test
parent6d206352c3c224228547fcfececb29d09b2b7fed (diff)
Replace Test::Unit to Test::Unit::Runner migrated with MiniTest::Unit
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4813
Diffstat (limited to 'tool/test')
-rw-r--r--tool/test/testunit/metametameta.rb10
-rw-r--r--tool/test/testunit/test_minitest_unit.rb8
2 files changed, 9 insertions, 9 deletions
diff --git a/tool/test/testunit/metametameta.rb b/tool/test/testunit/metametameta.rb
index d570106535..e494038939 100644
--- a/tool/test/testunit/metametameta.rb
+++ b/tool/test/testunit/metametameta.rb
@@ -45,9 +45,9 @@ class MetaMetaMetaTestCase < Test::Unit::TestCase
super
srand 42
Test::Unit::TestCase.reset
- @tu = Test::Unit.new
+ @tu = Test::Unit::Runner.new
- Test::Unit.runner = nil # protect the outer runner from the inner tests
+ Test::Unit::Runner.runner = nil # protect the outer runner from the inner tests
end
def teardown
@@ -57,13 +57,13 @@ class MetaMetaMetaTestCase < Test::Unit::TestCase
def with_output
synchronize do
begin
- save = Test::Unit.output
+ save = Test::Unit::Runner.output
@output = StringIO.new("")
- Test::Unit.output = @output
+ Test::Unit::Runner.output = @output
yield
ensure
- Test::Unit.output = save
+ Test::Unit::Runner.output = save
end
end
end
diff --git a/tool/test/testunit/test_minitest_unit.rb b/tool/test/testunit/test_minitest_unit.rb
index 2b708253c3..c0e32f5883 100644
--- a/tool/test/testunit/test_minitest_unit.rb
+++ b/tool/test/testunit/test_minitest_unit.rb
@@ -153,7 +153,7 @@ class TestMiniTestUnit < MetaMetaMetaTestCase
end
def test_default_runner_is_minitest_unit
- assert_instance_of Test::Unit, Test::Unit.runner
+ assert_instance_of Test::Unit::Runner, Test::Unit::Runner.runner
end
@@ -497,7 +497,7 @@ class TestMiniTestRunner < MetaMetaMetaTestCase
end
def test_run_with_other_runner
- Test::Unit.runner = Class.new Test::Unit do
+ Test::Unit::Runner.runner = Class.new Test::Unit::Runner do
def _run_suite suite, type
suite.before_suite # Run once before each suite
super suite, type
@@ -508,7 +508,7 @@ class TestMiniTestRunner < MetaMetaMetaTestCase
def self.name; "wacky!" end
def self.before_suite
- Test::Unit.output.puts "Running #{self.name} tests"
+ Test::Unit::Runner.output.puts "Running #{self.name} tests"
@@foo = 1
end
@@ -1722,7 +1722,7 @@ class TestMiniTestUnitRecording < MetaMetaMetaTestCase
@recording ||= Hash.new { |h,k| h[k] = [] }
end
- Test::Unit.runner = @tu
+ Test::Unit::Runner.runner = @tu
Class.new Test::Unit::TestCase, &block