ruby-changes:8019
From: ryan <ko1@a...>
Date: Thu, 25 Sep 2008 16:53:30 +0900 (JST)
Subject: [ruby-changes:8019] Ruby:r19544 (trunk): 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.
ryan 2008-09-25 16:53:19 +0900 (Thu, 25 Sep 2008) New Revision: 19544 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19544 Log: 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. Modified files: trunk/lib/mini/test.rb Index: lib/mini/test.rb =================================================================== --- lib/mini/test.rb (revision 19543) +++ lib/mini/test.rb (revision 19544) @@ -142,7 +142,7 @@ end 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 def assert_respond_to obj, meth, msg = nil @@ -322,7 +322,7 @@ if Mini::Assertion === e then @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 .*$/, '') @report << "Failure:\n#{meth}(#{klass}) [#{loc}]:\n#{e.message}\n" @@ -376,7 +376,7 @@ return failures + errors if @test_count > 0 # or return nil... end - def run_test_suites filter = /^test/ + def run_test_suites filter = /./ @test_count, @assertion_count = 0, 0 old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync= TestCase.test_suites.each do |suite| @@ -405,9 +405,12 @@ def run runner result = '.' begin + @passed = nil self.setup self.__send__ self.name + @passed = true rescue Exception => e + @passed = false result = runner.puke(self.class, self.name, e) ensure begin @@ -421,6 +424,7 @@ def initialize name @name = name + @passed = nil end def self.reset @@ -457,6 +461,10 @@ def setup; end def teardown; end + def passed? + @passed + end + include Mini::Assertions end # class TestCase end # class Test -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/