1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Added passed? per Jim's request. Fixed file/line reporting bug for refutations per Dave's bug report. Very minor cleanup of some nits that were bugging me. Barring other bug reports, I'm 'done'. This version will most likely be released as a gem in the next day or two.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ryan 2008-09-25 07:53:19 +00:00
parent 7ab330203a
commit dea63a4569

View file

@ -142,7 +142,7 @@ module Mini
end end
exp = exp.first if exp.size == 1 exp = exp.first if exp.size == 1
flunk "#{mu_pp(exp)} expected but nothing was raised." if should_raise fail "#{mu_pp(exp)} expected but nothing was raised." if should_raise
end end
def assert_respond_to obj, meth, msg = nil def assert_respond_to obj, meth, msg = nil
@ -322,7 +322,7 @@ module Mini
if Mini::Assertion === e then if Mini::Assertion === e then
@failures += 1 @failures += 1
loc = e.backtrace.find { |s| s !~ /in .(assert|flunk|pass|fail|raise)/ } loc = e.backtrace.find { |s| s !~ /in .(assert|refute|flunk|pass|fail|raise)/ }
loc.sub!(/:in .*$/, '') loc.sub!(/:in .*$/, '')
@report << "Failure:\n#{meth}(#{klass}) [#{loc}]:\n#{e.message}\n" @report << "Failure:\n#{meth}(#{klass}) [#{loc}]:\n#{e.message}\n"
@ -376,7 +376,7 @@ module Mini
return failures + errors if @test_count > 0 # or return nil... return failures + errors if @test_count > 0 # or return nil...
end end
def run_test_suites filter = /^test/ def run_test_suites filter = /./
@test_count, @assertion_count = 0, 0 @test_count, @assertion_count = 0, 0
old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync= old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
TestCase.test_suites.each do |suite| TestCase.test_suites.each do |suite|
@ -405,9 +405,12 @@ module Mini
def run runner def run runner
result = '.' result = '.'
begin begin
@passed = nil
self.setup self.setup
self.__send__ self.name self.__send__ self.name
@passed = true
rescue Exception => e rescue Exception => e
@passed = false
result = runner.puke(self.class, self.name, e) result = runner.puke(self.class, self.name, e)
ensure ensure
begin begin
@ -421,6 +424,7 @@ module Mini
def initialize name def initialize name
@name = name @name = name
@passed = nil
end end
def self.reset def self.reset
@ -457,6 +461,10 @@ module Mini
def setup; end def setup; end
def teardown; end def teardown; end
def passed?
@passed
end
include Mini::Assertions include Mini::Assertions
end # class TestCase end # class TestCase
end # class Test end # class Test