ruby-changes:67876
From: Hiroshi <ko1@a...>
Date: Sat, 11 Sep 2021 08:48:22 +0900 (JST)
Subject: [ruby-changes:67876] 7456cbdd09 (master): Move test_order under the Test::Unit::TestCase
https://git.ruby-lang.org/ruby.git/commit/?id=7456cbdd09 From 7456cbdd09b3f0e6d58cd16d8bd060a397d2156b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 7 Sep 2021 09:36:13 +0900 Subject: Move test_order under the Test::Unit::TestCase --- tool/lib/test/unit.rb | 26 -------------------------- 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 f2db3ee..79abe86 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -1262,30 +1262,4 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit.rb#L1262 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 d342e38..b913621 100644 --- a/tool/lib/test/unit/testcase.rb +++ b/tool/lib/test/unit/testcase.rb @@ -351,6 +351,26 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit/testcase.rb#L351 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 -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/