diff options
Diffstat (limited to 'tool/lib/test/unit')
| -rw-r--r-- | tool/lib/test/unit/assertions.rb | 4 | ||||
| -rw-r--r-- | tool/lib/test/unit/parallel.rb | 10 | ||||
| -rw-r--r-- | tool/lib/test/unit/testcase.rb | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index bdb25d0d85..335247458a 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -117,7 +117,7 @@ module Test self._assertions += 1 unless test then msg = msg.call if Proc === msg - raise Test::Assertion, msg + raise Test::Unit::AssertionFailedError, msg end true end @@ -578,7 +578,7 @@ module Test def skip msg = nil, bt = caller msg ||= "Skipped, no message given" @skip = true - raise Test::Skip, msg, bt + raise Test::Unit::PendedError, msg, bt end alias omit skip diff --git a/tool/lib/test/unit/parallel.rb b/tool/lib/test/unit/parallel.rb index 84bf0c3e25..5163220a2f 100644 --- a/tool/lib/test/unit/parallel.rb +++ b/tool/lib/test/unit/parallel.rb @@ -160,21 +160,21 @@ module Test end def puke(klass, meth, e) # :nodoc: - if e.is_a?(Test::Skip) - new_e = Test::Skip.new(e.message) + if e.is_a?(Test::Unit::PendedError) + new_e = Test::Unit::PendedError.new(e.message) new_e.set_backtrace(e.backtrace) e = new_e end - @partial_report << [klass.name, meth, e.is_a?(Test::Assertion) ? e : ProxyError.new(e)] + @partial_report << [klass.name, meth, e.is_a?(Test::Unit::AssertionFailedError) ? e : ProxyError.new(e)] super end def record(suite, method, assertions, time, error) # :nodoc: case error when nil - when Test::Assertion, Test::Skip + when Test::Unit::AssertionFailedError, Test::Unit::PendedError case error.cause - when nil, Test::Assertion, Test::Skip + when nil, Test::Unit::AssertionFailedError, Test::Unit::PendedError else bt = error.backtrace error = error.class.new(error.message) diff --git a/tool/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb index ea3092a4b3..19d90c58eb 100644 --- a/tool/lib/test/unit/testcase.rb +++ b/tool/lib/test/unit/testcase.rb @@ -141,7 +141,7 @@ module Test # Subclass TestCase to create your own tests. Typically you'll want a # TestCase subclass per implementation class. # - # See MiniTest::Assertions + # See MiniTest::Unit::AssertionFailedErrors class TestCase include Assertions @@ -195,7 +195,7 @@ module Test rescue *PASSTHROUGH_EXCEPTIONS raise rescue Exception => e - @passed = Test::Skip === e + @passed = Test::Unit::PendedError === e time = Time.now - start_time runner.record self.class, self.__name__, self._assertions, time, e result = runner.puke self.class, self.__name__, e |