activegroonga 0.0.7 → 1.0.0

data/test-unit/lib/test/unit/ui/emacs/testrunner.rb

@@ -22,6 +22,20 @@ module Test
             end
           end
 
+          def output_fault_backtrace(fault)
+            backtrace = fault.location
+            if backtrace.size == 1
+              output(fault.test_name +
+                     backtrace[0].sub(/\A(.+:\d+).*/, ' [\\1]') +
+                     ":")
+            else
+              output(fault.test_name)
+              backtrace.each do |entry|
+                output(entry)
+              end
+            end
+          end
+
           def format_fault_failure(failure)
             if failure.location.size == 1
               location = failure.location[0]

data/test-unit/lib/test/unit/ui/tap/testrunner.rb

@@ -1,7 +1,7 @@
 #--
 #
 # Author:: Kouhei Sutou.
-# Copyright:: Copyright (c) 2009 Kouhei Sutou <kou@clear-code.com>.
+# Copyright:: Copyright (c) 2009-2010 Kouhei Sutou <kou@clear-code.com>.
 # License:: Ruby license.
 
 require 'test/unit/ui/testrunner'
@@ -24,8 +24,7 @@ module Test
 
           # Begins the test run.
           def start
-            setup_mediator
-            result = start_mediator
+            result = super
             def result.passed?
               true # for prove commend :<
             end
@@ -33,11 +32,6 @@ module Test
           end
 
           private
-          def setup_mediator
-            @mediator = TestRunnerMediator.new(@suite)
-            attach_to_mediator
-          end
-
           def attach_to_mediator
             @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
             @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
@@ -46,10 +40,6 @@ module Test
             @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
           end
 
-          def start_mediator
-            @mediator.run_suite
-          end
-
           def add_fault(fault)
             puts("not ok #{@n_tests} - #{fault.short_display}")
             fault.long_display.each_line do |line|

data/test-unit/lib/test/unit/ui/testrunner.rb

@@ -6,6 +6,7 @@ module Test
       class TestRunner
         extend TestRunnerUtilities
 
+        attr_reader :listeners
         def initialize(suite, options={})
           if suite.respond_to?(:suite)
             @suite = suite.suite
@@ -13,6 +14,38 @@ module Test
             @suite = suite
           end
           @options = options
+          @listeners = @options[:listeners] || []
+        end
+
+        # Begins the test run.
+        def start
+          setup_mediator
+          attach_to_mediator
+          attach_listeners
+          start_mediator
+        end
+
+        private
+        def setup_mediator
+          @mediator = TestRunnerMediator.new(@suite)
+        end
+
+        def attach_listeners
+          @listeners.each do |listener|
+            listener.attach_to_mediator(@mediator)
+          end
+        end
+
+        def start_mediator
+          @mediator.run_suite
+        end
+
+        def diff_target_string?(string)
+          Assertions::AssertionMessage.diff_target_string?(string)
+        end
+
+        def prepare_for_diff(from, to)
+          Assertions::AssertionMessage.prepare_for_diff(from, to)
         end
       end
     end

data/test-unit/lib/test/unit/util/backtracefilter.rb

@@ -9,6 +9,7 @@ module Test
         module_function
         def filter_backtrace(backtrace, prefix=nil)
           return ["No backtrace"] unless(backtrace)
+          return backtrace if ENV["TEST_UNIT_ALL_BACKTRACE"]
           split_p = if(prefix)
             prefix.split(TESTUNIT_FILE_SEPARATORS)
           else

data/test-unit/lib/test/unit/util/output.rb

@@ -0,0 +1,31 @@
+module Test
+  module Unit
+    module Util
+      module Output
+        ##
+        # Returns output for standard output and standard
+        # error as string.
+        #
+        # Example:
+        #   capture_output do
+        #     puts("stdout")
+        #     warn("stderr")
+        #   end # -> ["stdout\n", "stderr\n"]
+        def capture_output
+          require 'stringio'
+
+          output = StringIO.new
+          error = StringIO.new
+          stdout_save, stderr_save = $stdout, $stderr
+          $stdout, $stderr = output, error
+          begin
+            yield
+            [output.string, error.string]
+          ensure
+            $stdout, $stderr = stdout_save, stderr_save
+          end
+        end
+      end
+    end
+  end
+end

data/test-unit/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.0.3'
+    VERSION = '2.1.3'
   end
 end

data/test-unit/sample/{tc_adder.rb → test_adder.rb}

@@ -5,13 +5,15 @@
 require 'test/unit'
 require 'adder'
 
-class TC_Adder < Test::Unit::TestCase
+class TestAdder < Test::Unit::TestCase
   def setup
     @adder = Adder.new(5)
   end
+
   def test_add
     assert_equal(7, @adder.add(2), "Should have added correctly")
   end
+
   def teardown
     @adder = nil
   end

data/test-unit/sample/{tc_subtracter.rb → test_subtracter.rb}

@@ -5,13 +5,15 @@
 require 'test/unit'
 require 'subtracter'
 
-class TC_Subtracter < Test::Unit::TestCase
+class TestSubtracter < Test::Unit::TestCase
   def setup
     @subtracter = Subtracter.new(5)
   end
+
   def test_subtract
     assert_equal(3, @subtracter.subtract(2), "Should have subtracted correctly")
   end
+
   def teardown
     @subtracter = nil
   end

data/test-unit/sample/test_user.rb

@@ -1,4 +1,5 @@
 # nested test case example.
+require 'test/unit'
 
 class UserTest < Test::Unit::TestCase
   def setup

data/test-unit/test/collector/test-descendant.rb

@@ -66,7 +66,7 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       collector.filter = [Proc.new {false}, Proc.new {true}]
     end
 
-    assert_collect(full_suite) do |collector|
+    assert_collect(empty_suite) do |collector|
       collector.filter = [Proc.new {true}, Proc.new {false}]
     end
 
@@ -90,13 +90,11 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       end
     end
 
-    expected = empty_suite
     suite1 = Test::Unit::TestSuite.new(@test_case1.name)
     suite1 << @test_case1.new("test_1")
     suite2 = Test::Unit::TestSuite.new(@test_case2.name)
     suite2 << @test_case2.new("test_0")
-    expected << suite1 << suite2
-    assert_collect(expected) do |collector|
+    assert_collect(empty_suite) do |collector|
       filters = [Proc.new {|test| test.method_name == 'test_1' ? true : nil},
                  Proc.new {|test| test.method_name == 'test_0' ? true : nil},
                  Proc.new {false}]

data/test-unit/test/collector/test-load.rb

@@ -13,8 +13,9 @@ class TestUnitCollectorLoad < Test::Unit::TestCase
     ::Object.const_set(@temporary_test_cases_module_name, Module.new)
 
     @test_dir = Pathname(Dir.tmpdir) + "test-unit"
-    @test_dir.rmtree if @test_dir.exist?
-    @test_dir.mkpath
+    @extra_test_dir = Pathname(Dir.tmpdir) + "test-unit-extra"
+    ensure_clean_directory(@test_dir)
+    ensure_clean_directory(@extra_test_dir)
   end
 
   setup
@@ -196,6 +197,72 @@ EOT
     end
   end
 
+  setup
+  def setup_sub_git_test_cases
+    @sub_git_test_dir = @sub_test_dir + ".git"
+    @sub_git_test_dir.mkpath
+
+    @sub_git_test_case11 = @sub_git_test_dir + "test_case11.rb"
+
+    @sub_git_test_case11.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class SubGitTestCase11 < Test::Unit::TestCase
+    def test11
+    end
+  end
+end
+EOT
+    end
+  end
+
+  setup
+  def setup_extra_top_level_test_cases
+    @test_cases12 = @extra_test_dir + "test_cases12.rb"
+    @test_cases12.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class TestCase121 < Test::Unit::TestCase
+    def test121_1
+    end
+
+    def test121_2
+    end
+  end
+
+  class TestCase122 < Test::Unit::TestCase
+    def test122_1
+    end
+
+    def test122_2
+    end
+  end
+end
+EOT
+    end
+  end
+
+  setup
+  def setup_sub_level_extra_test_cases
+    @sub_extra_test_dir = @extra_test_dir + "sub"
+    @sub_extra_test_dir.mkpath
+
+    @cases13_test = @sub_extra_test_dir + "13cases_test.rb"
+    @cases13_test.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class SubTestCase13 < Test::Unit::TestCase
+    def test13_1
+    end
+
+    def test13_2
+    end
+  end
+end
+EOT
+    end
+  end
+
   def teardown
     @test_dir.rmtree if @test_dir.exist?
     ::Object.send(:remove_const, @temporary_test_cases_module_name)
@@ -212,6 +279,21 @@ EOT
                    @sub_test_dir.to_s)
   end
 
+  def test_simple_collect_test_suffix
+    assert_collect([:suite, {:name => @extra_test_dir.basename.to_s},
+                    [:suite, {:name => _test_case_name("TestCase121")},
+                     [:test, {:name => "test121_1"}],
+                     [:test, {:name => "test121_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase122")},
+                     [:test, {:name => "test122_1"}],
+                     [:test, {:name => "test122_2"}]],
+                    [:suite, {:name => @sub_extra_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase13")},
+                      [:test, {:name => "test13_1"}],
+                      [:test, {:name => "test13_2"}]]]],
+                   @extra_test_dir.to_s)
+  end
+
   def test_multilevel_collect
     assert_collect([:suite, {:name => "."},
                     [:suite, {:name => _test_case_name("TestCase1")},
@@ -234,13 +316,39 @@ EOT
   end
 
   def test_collect_file
-    assert_collect([:suite, {:name => @test_case1.basename.to_s},
-                    [:suite, {:name => _test_case_name("TestCase1")},
-                     [:test, {:name => "test1_1"}],
-                     [:test, {:name => "test1_2"}]]],
+    assert_collect([:suite, {:name => _test_case_name("TestCase1")},
+                    [:test, {:name => "test1_1"}],
+                    [:test, {:name => "test1_2"}]],
                    @test_case1.to_s)
+  end
 
-    assert_collect(nil, @no_load_sub_test_case5.to_s)
+  def test_collect_file_no_pattern_match_file_name
+    assert_collect([:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
+                    [:test, {:name => "test5_1"}],
+                    [:test, {:name => "test5_2"}]],
+                   @no_load_sub_test_case5.to_s)
+  end
+
+  def test_collect_file_test_cases
+    assert_collect([:suite, {:name => "[#{@test_cases12}]"},
+                    [:suite, {:name => _test_case_name("TestCase121")},
+                     [:test, {:name => "test121_1"}],
+                     [:test, {:name => "test121_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase122")},
+                     [:test, {:name => "test122_1"}],
+                     [:test, {:name => "test122_2"}]]],
+                   @test_cases12.to_s)
+  end
+
+  def test_collect_files
+    assert_collect([:suite,
+                    {:name => "[#{@test_case1}, #{@test_case2}]"},
+                    [:suite, {:name => _test_case_name("TestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase2")},
+                     [:test, {:name => "test2"}]]],
+                   @test_case1.to_s, @test_case2.to_s)
   end
 
   def test_nil_pattern
@@ -278,7 +386,7 @@ EOT
                       [:test, {:name => "test4_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase6")},
                       [:test, {:name => "test6"}]]],
-                   [:suite, {:name => @sub2_test_dir.basename.to_s},
+                    [:suite, {:name => @sub2_test_dir.basename.to_s},
                      [:suite, {:name => _test_case_name("Sub2TestCase8")},
                       [:test, {:name => "test8_1"}],
                       [:test, {:name => "test8_2"}]],
@@ -299,6 +407,11 @@ EOT
     end
   end
 
+  def ensure_clean_directory(directory)
+    directory.rmtree if directory.exist?
+    directory.mkpath
+  end
+
   def keep_required_files
     required_files = $".dup
     yield

data/test-unit/test/collector/test_objectspace.rb

@@ -72,7 +72,7 @@ module Test
           assert_equal(empty_suite, @c.collect)
 
           @c.filter = [proc{true}, proc{false}]
-          assert_equal(full_suite, @c.collect)
+          assert_equal(empty_suite, @c.collect)
 
           @c.filter = [proc{nil}, proc{false}]
           assert_equal(empty_suite, @c.collect)
@@ -87,10 +87,12 @@ module Test
           assert_equal(expected, @c.collect)
 
           expected = TestSuite.new(ObjectSpace::NAME)
-          expected << (TestSuite.new(@tc1.name) << @tc1.new('test_1'))
-          expected << (TestSuite.new(@tc2.name) << @tc2.new('test_0'))
-          @c.filter = [proc{|t| t.method_name == 'test_1' ? true : nil}, proc{|t| t.method_name == 'test_0' ? true : nil}, proc{false}]
-          assert_equal(expected, @c.collect)
+          TestSuite.new(@tc1.name) << @tc1.new('test_1')
+          TestSuite.new(@tc2.name) << @tc2.new('test_0')
+          @c.filter = [proc{|t| t.method_name == 'test_1' ? true : nil},
+                       proc{|t| t.method_name == 'test_0' ? true : nil},
+                       proc{false}]
+          assert_equal(empty_suite, @c.collect)
         end
       end
     end

data/test-unit/test/run-test.rb

@@ -2,6 +2,8 @@
 
 $VERBOSE = true
 
+$KCODE = "utf8" unless "".respond_to?(:encoding)
+
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")

data/test-unit/test/test-color-scheme.rb

@@ -1,8 +1,10 @@
 class TestUnitColorScheme < Test::Unit::TestCase
   def test_default
     assert_equal({
-                   "success" => color("green", :bold => true),
-                   "failure" => color("red", :bold => true),
+                   "pass" => color("green", :foreground => false) +
+                                color("white", :bold => true),
+                   "failure" => color("red", :foreground => false) +
+                                color("white", :bold => true),
                    "pending" => color("magenta", :bold => true),
                    "omission" => color("blue", :bold => true),
                    "notification" => color("cyan", :bold => true),
@@ -12,6 +14,13 @@ class TestUnitColorScheme < Test::Unit::TestCase
                              color("blue", :foreground => false),
                    "suite" => color("white", :bold => true) +
                               color("green", :foreground => false),
+                   "diff-inserted-tag" => color("red", :bold => true),
+                   "diff-deleted-tag" => color("green", :bold => true),
+                   "diff-difference-tag" => color("cyan", :bold => true),
+                   "diff-inserted" => color("red", :foreground => false) +
+                                      color("white", :bold => true),
+                   "diff-deleted" => color("green", :foreground => false) +
+                                     color("white", :bold => true),
                  },
                  Test::Unit::ColorScheme.default.to_hash)
   end