diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 13:48:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 13:48:14 +0000 |
commit | e67e930462b781f09e412e161c4ed8515640bdb2 (patch) | |
tree | 895a1332a44134edc0839e03fad97d11a6b5f242 /lib/test/unit/autorunner.rb | |
parent | 3fb4d657d8006c8f2332053d7ff3a92695c60ca4 (diff) |
* lib/test/unit/autorunner.rb: remove dependency to a particular
runner. [ruby-core:01901], [ruby-list:38869]
* lib/test/unit/ui/testrunnerutilities.rb: moved output level
constants from Console.
* lib/test/unit/ui/console/testrunner.rb: ditto.
* lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
accept output_level.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test/unit/autorunner.rb')
-rw-r--r-- | lib/test/unit/autorunner.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb index 49fe543550..76c3100472 100644 --- a/lib/test/unit/autorunner.rb +++ b/lib/test/unit/autorunner.rb @@ -1,7 +1,6 @@ +require 'test/unit/ui/testrunnerutilities' require 'optparse' -require 'test/unit/ui/console/testrunner' - module Test module Unit class AutoRunner @@ -17,31 +16,32 @@ module Test RUNNERS = { :console => proc do |r| - Test::Unit::UI::Console::TestRunner.run(r.suite, r.output_level) + require 'test/unit/ui/console/testrunner' + Test::Unit::UI::Console::TestRunner end, :gtk => proc do |r| require 'test/unit/ui/gtk/testrunner' - Test::Unit::UI::GTK::TestRunner.run(r.suite) + Test::Unit::UI::GTK::TestRunner end, :gtk2 => proc do |r| require 'test/unit/ui/gtk2/testrunner' - Test::Unit::UI::GTK2::TestRunner.run(r.suite) + Test::Unit::UI::GTK2::TestRunner end, :fox => proc do |r| require 'test/unit/ui/fox/testrunner' - Test::Unit::UI::Fox::TestRunner.run(r.suite) + Test::Unit::UI::Fox::TestRunner end, :tk => proc do |r| require 'test/unit/ui/tk/testrunner' - Test::Unit::UI::Tk::TestRunner.run(r.suite) + Test::Unit::UI::Tk::TestRunner end, } OUTPUT_LEVELS = { - :silent => UI::Console::TestRunner::SILENT, - :progress => UI::Console::TestRunner::PROGRESS_ONLY, - :normal => UI::Console::TestRunner::NORMAL, - :verbose => UI::Console::TestRunner::VERBOSE, + :silent => UI::SILENT, + :progress => UI::PROGRESS_ONLY, + :normal => UI::NORMAL, + :verbose => UI::VERBOSE, } COLLECTORS = { @@ -71,7 +71,7 @@ module Test @collector = COLLECTORS[(standalone ? :dir : :objectspace)] @filters = [] @to_run = [] - @output_level = Test::Unit::UI::Console::TestRunner::NORMAL + @output_level = UI::NORMAL yield(self) if(block_given?) end @@ -180,7 +180,7 @@ module Test def run @suite = @collector[self] result = @runner[self] or return false - result.passed? + result.run(@suite, @output_level).passed? end end end |