diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-09-07 09:36:13 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-09-11 08:48:03 +0900 |
commit | 7456cbdd09b3f0e6d58cd16d8bd060a397d2156b (patch) | |
tree | 1ad6cd332dd25a1ee4c19587ec11254c13363ec7 | |
parent | 93c44c4ed2f3b35db862f4238e5fb104cfb7aab9 (diff) | |
download | ruby-7456cbdd09b3f0e6d58cd16d8bd060a397d2156b.tar.gz |
Move test_order under the Test::Unit::TestCase
-rw-r--r-- | tool/lib/test/unit.rb | 26 | ||||
-rw-r--r-- | tool/lib/test/unit/testcase.rb | 20 |
2 files changed, 20 insertions, 26 deletions
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index f2db3ee34f..79abe86f24 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -1262,30 +1262,4 @@ module Test end end -module MiniTest # :nodoc: all - class Unit - end -end - -class MiniTest::Unit::TestCase # :nodoc: all - test_order = self.test_order - class << self - attr_writer :test_order - undef test_order - end - def self.test_order - defined?(@test_order) ? @test_order : superclass.test_order - end - self.test_order = test_order - undef run_test - RUN_TEST_TRACE = "#{__FILE__}:#{__LINE__+3}:in `run_test'".freeze - def run_test(name) - progname, $0 = $0, "#{$0}: #{self.class}##{name}" - self.__send__(name) - ensure - $@.delete(RUN_TEST_TRACE) if $@ - $0 = progname - end -end - Test::Unit::Runner.autorun diff --git a/tool/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb index d342e384af..b913621fc3 100644 --- a/tool/lib/test/unit/testcase.rb +++ b/tool/lib/test/unit/testcase.rb @@ -351,6 +351,26 @@ module Test end @test_methods[name] = true end + + test_order = self.test_order + class << self + attr_writer :test_order + undef test_order + end + def self.test_order + defined?(@test_order) ? @test_order : superclass.test_order + end + self.test_order = test_order + undef run_test + RUN_TEST_TRACE = "#{__FILE__}:#{__LINE__+3}:in `run_test'".freeze + def run_test(name) + progname, $0 = $0, "#{$0}: #{self.class}##{name}" + self.__send__(name) + ensure + $@.delete(RUN_TEST_TRACE) if $@ + $0 = progname + end + end end end |