diff options
Diffstat (limited to 'lib/test/unit/ui')
-rw-r--r-- | lib/test/unit/ui/fox/testrunner.rb | 3 | ||||
-rw-r--r-- | lib/test/unit/ui/gtk/testrunner.rb | 4 | ||||
-rw-r--r-- | lib/test/unit/ui/gtk2/testrunner.rb | 5 | ||||
-rw-r--r-- | lib/test/unit/ui/tk/testrunner.rb | 6 |
4 files changed, 14 insertions, 4 deletions
diff --git a/lib/test/unit/ui/fox/testrunner.rb b/lib/test/unit/ui/fox/testrunner.rb index 8b82ec634d..b3c0ce0e40 100644 --- a/lib/test/unit/ui/fox/testrunner.rb +++ b/lib/test/unit/ui/fox/testrunner.rb @@ -41,6 +41,7 @@ module Test @suite = suite end + @result = nil @red = false end @@ -50,6 +51,7 @@ module Test setup_mediator attach_to_mediator start_ui + @result end def setup_mediator # :nodoc: @@ -132,6 +134,7 @@ module Test end def started(result) # :nodoc: + @result = result output_status("Started...") end diff --git a/lib/test/unit/ui/gtk/testrunner.rb b/lib/test/unit/ui/gtk/testrunner.rb index d6ce527fe9..14fbce2573 100644 --- a/lib/test/unit/ui/gtk/testrunner.rb +++ b/lib/test/unit/ui/gtk/testrunner.rb @@ -33,6 +33,7 @@ module Test else @suite = suite end + @result = nil @runner = Thread.current @restart_signal = Class.new(Exception) @@ -49,6 +50,7 @@ module Test setup_ui attach_to_mediator start_ui + @result end private @@ -94,7 +96,6 @@ module Test retry rescue end - exit !@red end def stop(*) # :nodoc: @@ -145,6 +146,7 @@ module Test end def started(result) # :nodoc: + @result = result output_status("Started...") end diff --git a/lib/test/unit/ui/gtk2/testrunner.rb b/lib/test/unit/ui/gtk2/testrunner.rb index 1efc7dd758..c68d7a2059 100644 --- a/lib/test/unit/ui/gtk2/testrunner.rb +++ b/lib/test/unit/ui/gtk2/testrunner.rb @@ -322,6 +322,7 @@ module Test private :test_started def started(result) # :nodoc: + @result = result output_status("Started...") end # def started(result) private :started @@ -405,8 +406,8 @@ module Test rescue @restart_signal retry rescue + puts $!, $@ end - exit !@red end # def start_ui private :start_ui @@ -437,6 +438,7 @@ module Test setup_ui attach_to_mediator start_ui + @result end # def start def initialize(suite) @@ -445,6 +447,7 @@ module Test else @suite = suite end + @result = nil @runner = Thread.current @restart_signal = Class.new(Exception) diff --git a/lib/test/unit/ui/tk/testrunner.rb b/lib/test/unit/ui/tk/testrunner.rb index 3c3e0f554f..9e444ca9ac 100644 --- a/lib/test/unit/ui/tk/testrunner.rb +++ b/lib/test/unit/ui/tk/testrunner.rb @@ -34,6 +34,7 @@ module Test else @suite = suite end + @result = nil @red = false @fault_detail_list = [] @@ -52,6 +53,7 @@ module Test setup_mediator attach_to_mediator start_ui + @result end private @@ -102,7 +104,6 @@ module Test retry rescue end - exit !@red end def stop # :nodoc: @@ -112,7 +113,7 @@ module Test def reset_ui(count) # :nodoc: @test_total_count = count.to_f @test_progress_bar.configure('background'=>'green') - @test_progress_bar.place('relwidth'=>0/count) + @test_progress_bar.place('relwidth'=>(count.zero? ? 0 : 0/count)) @red = false @test_count_label.value = 0 @@ -155,6 +156,7 @@ module Test end def started(result) # :nodoc: + @result = result output_status("Started...") end |