ruby-dev

西山和広です。

lib/test/unit/ui/tk/testrunner.rbを作ってみました。
良ければ取り込んでください。

test/ruby/test_signal.rbで例外がTk.mainloopが動いているメインスレッドに
来ているという問題もありましたが、これはTk.mainloopに来た例外をテスト
実行中の場合はテストを実行しているスレッドに投げ直すことで対応しました。


== 既知の問題点:
: test/runner.rb --runner=tkを実行するとfailureが4つある。
  --runner=foxと共通のfailure(test_add_failed_assertionと
  test_add_failure_nested)とtest_assert_nothing_thrownと
  test_assert_throws。
: progressbarの場所に表示しているものがprogressbarではない。
  TkCanvasで作ってみればいいかと思ったのですが、TkCanvasの使い方が
  わからなかったのでTkLabelで色が緑と赤になるだけでごまかしています。
: TkTextが折り返し表示をしているので横スクロールバーが無意味
  TkTextがデフォルトで縦と横のスクロールバー付きでしかも折り返し
  表示してくれているので、横スクロールバーに意味がないと思うのですが、
  デフォルトの動作のようなのでそのままにしています。
  (変更方法がわからなかったという理由もあります。)


-- 
|ZnZ(ゼット エヌ ゼット)
|西山和広(Kazuhiro NISHIYAMA)

Attachments (2)

testrunner.rb (7.26 KB, text/x-ruby)

# :nodoc:
#
# Original Author:: Nathaniel Talbott.
# Author:: Kazuhiro NISHIYAMA.
# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
# Copyright:: Copyright (c) 2003 Kazuhiro NISHIYAMA. All rights reserved.
# License:: Ruby license.

require 'tk'
require 'test/unit/ui/testrunnermediator'
require 'test/unit/ui/testrunnerutilities'

module Test
  module Unit
    module UI
      module Tk # :nodoc:

        # Runs a Test::Unit::TestSuite in a Tk UI. Obviously,
        # this one requires you to have Tk
        # and the Ruby Tk extension installed.
        class TestRunner
          extend TestRunnerUtilities

          # Creates a new TestRunner and runs the suite.
          def self.run(suite)
            new(suite).start

          end

          # Creates a new TestRunner for running the passed
          # suite.
          def initialize(suite)
            if (suite.respond_to?(:suite))
              @suite = suite.suite
            else
              @suite = suite
            end

            @red = false
            @fault_detail_list = []
            @run_suite_thread = nil
          end

          # Begins the test run.
          def start
            setup_ui
            setup_mediator
            attach_to_mediator
            start_ui
          end

          private
          def setup_mediator # :nodoc:
            @mediator = TestRunnerMediator.new(@suite)
            suite_name = @suite.to_s
            if ( @suite.kind_of?(Module) )
              suite_name = @suite.name
            end
            @suite_name_entry.value = suite_name
          end

          def attach_to_mediator # :nodoc:
            @run_button.command(method(:run_suite))
            @fault_list.bind('ButtonPress-1', proc{|y|
              fault = @fault_detail_list[@fault_list.nearest(y)]
              if fault
                show_fault(fault)
              end
            }, '%y')
            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
          end

          def start_ui # :nodoc:
            run_suite
            begin
              ::Tk.mainloop
            rescue Exception
              if @run_suite_thread and @run_suite_thread.alive?
                @run_suite_thread.raise $!
                retry
              else
                raise
              end
            end
          end

          def stop # :nodoc:
            ::Tk.exit
          end

          def reset_ui(count) # :nodoc:
            @test_progress_bar.configure('background'=>'green')
            @red = false

            @test_count_label.value = 0
            @assertion_count_label.value = 0
            @failure_count_label.value = 0
            @error_count_label.value = 0

            @fault_list.delete(0, 'end')
            @fault_detail_list = []
            clear_fault
          end

          def add_fault(fault) # :nodoc:
            if ( ! @red )
              @test_progress_bar.configure('background'=>'red')
              @red = true
            end
            @fault_detail_list.push fault
            @fault_list.insert('end', fault.short_display)
          end

          def show_fault(fault) # :nodoc:
            raw_show_fault(fault.long_display)
          end

          def raw_show_fault(string) # :nodoc:
            @detail_text.value = string
          end

          def clear_fault # :nodoc:
            raw_show_fault("")
          end

          def result_changed(result) # :nodoc:
            @test_count_label.value = result.run_count.to_s
            @assertion_count_label.value = result.assertion_count.to_s
            @failure_count_label.value = result.failure_count.to_s
            @error_count_label.value = result.error_count.to_s
          end

          def started(result) # :nodoc:
            output_status("Started...")
          end

          def test_started(test_name)
            output_status("Running #{test_name}...")
          end

          def finished(elapsed_time)
            output_status("Finished in #{elapsed_time} seconds")
          end

          def output_status(string) # :nodoc:
            @status_entry.value = string
          end

          def setup_ui # :nodoc:
            @status_entry = TkVariable.new
            l = TkLabel.new(nil, 'textvariable'=>@status_entry, 'relief'=>'sunken')
            l.pack('side'=>'bottom', 'fill'=>'x')

            suite_frame = TkFrame.new.pack('fill'=>'x')

            @run_button = TkButton.new(suite_frame, 'text'=>'Run')
            @run_button.pack('side'=>'right')

            TkLabel.new(suite_frame, 'text'=>'Suite:').pack('side'=>'left')
            @suite_name_entry = TkVariable.new
            l = TkLabel.new(suite_frame, 'textvariable'=>@suite_name_entry, 'relief'=>'sunken')
            l.pack('side'=>'left', 'fill'=>'x', 'expand'=>true)

            @test_progress_bar = TkLabel.new(nil, 'background'=>'green')
            @test_progress_bar.pack('fill'=>'x')


            info_frame = TkFrame.new.pack('fill'=>'x', 'expand'=>true)
            @test_count_label = create_count_label(info_frame, 'Tests:')
            @assertion_count_label = create_count_label(info_frame, 'Assertions:')
            @failure_count_label = create_count_label(info_frame, 'Failures:')
            @error_count_label = create_count_label(info_frame, 'Errors:')

            fault_list_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)

            fault_scrollbar = TkScrollbar.new(fault_list_frame)
            fault_scrollbar.pack('side'=>'right', 'fill'=>'y')
            @fault_list = TkListbox.new(fault_list_frame)
            @fault_list.pack('fill'=>'both', 'expand'=>true)
            @fault_list.yscrollbar(fault_scrollbar)

            detail_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)
            detail_scrollbar_y = TkScrollbar.new(detail_frame)
            detail_scrollbar_y.pack('side'=>'right', 'fill'=>'y')
            detail_scrollbar_x = TkScrollbar.new(detail_frame)
            detail_scrollbar_x.pack('side'=>'bottom', 'fill'=>'x')
            @detail_text = TkText.new(detail_frame, 'height'=>10) {
              bindtags(bindtags - [TkText])
            }
            @detail_text.pack('fill'=>'both', 'expand'=>true)
            @detail_text.yscrollbar(detail_scrollbar_y)
            @detail_text.xscrollbar(detail_scrollbar_x)
          end

          def create_count_label(parent, label) # :nodoc:
            TkLabel.new(parent, 'text'=>label).pack('side'=>'left', 'expand'=>true)
            v = TkVariable.new(0)
            TkLabel.new(parent, 'textvariable'=>v).pack('side'=>'left', 'expand'=>true)
            v
          end

          def run_suite # :nodoc:
            run_proc = proc {
              @run_suite_thread = Thread.start {
                @mediator.run_suite
              }
            }
            TkAfter.new(1000, 1, run_proc).start
          end
        end
      end
    end
  end
end

if __FILE__ == $0
  Test::Unit::UI::Tk::TestRunner.start_command_line_test
end

autorunner.rb.diff (484 Bytes, text/x-diff)

diff -u -p -r1.2 autorunner.rb
--- lib/test/unit/autorunner.rb	30 Oct 2003 01:17:40 -0000	1.2
+++ lib/test/unit/autorunner.rb	30 Oct 2003 17:00:53 -0000
@@ -29,6 +29,10 @@ module Test
           require 'test/unit/ui/fox/testrunner'
           Test::Unit::UI::Fox::TestRunner.run(r.suite)
         end,
+        :tk => proc do |r|
+          require 'test/unit/ui/tk/testrunner'
+          Test::Unit::UI::Tk::TestRunner.run(r.suite)
+        end,
       }
 
       OUTPUT_LEVELS = {

Thread

Prev Next

In This Thread

Prev Next

[#21809] lib/test/unit/ui/tk/testrunner.rb — Kazuhiro NISHIYAMA <zn@...>

[#21813] few seconds wait to exit when exception is raised in inspect — Tanaka Akira <akr@...17n.org>

[#21819] error message of Array.new(9,0){|x|x+1} — Take_tk <ggb03124@...>

[#21830] pty on FreeBSD — matz@... (Yukihiro Matsumoto)

[#21842] {0=>1}.fetch(0, 2) {} — Tanaka Akira <akr@...17n.org>

[#21846] StringIO#path — matz@... (Yukihiro Matsumoto)

[#21848] Re: [ruby-list:38765] RUBYOPT & __FILE__ — nobu.nakada@...

[#21876] get_last_error or getLastError by DL::Importable — Take_tk <ggb03124@...>

[#21879] win32 -r case sensitive — Kazuhiro Yoshida <moriq@...>

[#21883] right hand Regexp — Koji Arai <JCA02266@...>

[#21891] `write': closed stream (IOError) from benckmark — "NAKAMURA, Hiroshi" <nakahiro@...>

[#21895] BUG on String#tr ?? — Take_tk <ggb03124@...>

[#21899] core dump in rb_hash_aset — Tanaka Akira <akr@...17n.org>

[#21902] [Oniguruma] Version 1.9.5 — kkosako@...

[#21925] CGI#read_multipart raises NoMethodError — akira yamada <akira@...>

[#21932] rough / tabs.rb — Minero Aoki <aamine@...>

[#21933] new hash literal — nobu.nakada@...

[#21938] 1.8.1 schedule? — "NAKAMURA, Hiroshi" <nakahiro@...>

[#21939] StringIO.new("").read — Tanaka Akira <akr@...17n.org>

[#21942] Zlib::GzipReader#read — Tanaka Akira <akr@...17n.org>

[#21943] IO#read — Tanaka Akira <akr@...17n.org>

[#21945] drive letter handling on OS/2 with EMX — siena@... (Siena. / SHINAGAWA, Norihide)

[#21946] Re: [ruby-cvs] ruby, ruby/lib, ruby/test/fileutils: * lib/fileutils.rb (fu_same?): check by inode instead of path name, to detect two hard links pointing to the same content. — "U.Nakamura" <usa@...>

[#21948] undefined method `m' for %s%s%s — Tanaka Akira <akr@...17n.org>

[#21955] block local parameters in Ruby2 — Shugo Maeda <shugo@...>

[#21973] [Oniguruma] bug and memory leak — kkosako@...

[#21990] environment variables in ruby.1 — Minero Aoki <aamine@...>

[#21991] Re: [ruby-list:38619] dl and win32 API call — Tietew <tietew-ml-ruby-dev@...>

[#22000] purge pthread at configure — "U.Nakamura" <usa@...>

[#22010] Marshal and CGI::Cookie — Masatoshi SEKI <m_seki@...>

[#22013] HTTP_PROXY — Tanaka Akira <akr@...17n.org>

[#22019] $stdout/$stderr must respond IO methods? — Tietew <tietew-ml-ruby-dev@...>

[#22025] --enable-pthread on FreeBSD — "U.Nakamura" <usa@...>

[#22042] ENV["path"].tainted? — Tanaka Akira <akr@...17n.org>

[#22045] test_fileutils.rb — Kazuhiro NISHIYAMA <zn@...>

[#22057] drb/drb.rb document — Minero Aoki <aamine@...>

[#22067] exit value as boolean — nobu.nakada@...

[#22071] Dir.glob と Shjift_JIS について — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#22080] configure 時の CPPFLAGS や 鳴凸素 — "URABE Shyouhei aka.mput" <root@...>

[#22094] optparseのsample — Kazuhiro NISHIYAMA <zn@...>

[ruby-dev:21809] lib/test/unit/ui/tk/testrunner.rb

Attachments (2)

Thread

In This Thread

[#21848] Re: [ruby-list:38765] RUBYOPT & FILE — nobu.nakada@...

[#22080] configure 時の CPPFLAGS や鳴凸素 — "URABE Shyouhei aka.mput" <root@...>