test-unit 3.2.0 → 3.3.6

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

@@ -3,7 +3,7 @@
 # Author:: Nathaniel Talbott.
 # Copyright::
 #   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-#   * Copyright (c) 2008-2013 Kouhei Sutou <kou@clear-code.com>
+#   * Copyright (c) 2008-2017 Kouhei Sutou <kou@clear-code.com>
 # License:: Ruby license.
 
 begin
@@ -47,6 +47,8 @@ module Test
             @progress_row_max ||= guess_progress_row_max
             @show_detail_immediately = @options[:show_detail_immediately]
             @show_detail_immediately = true if @show_detail_immediately.nil?
+            @reverse_output = @options[:reverse_output]
+            @reverse_output = @output.tty? if @reverse_output.nil?
             @already_outputted = false
             @indent = 0
             @top_level = true
@@ -110,8 +112,10 @@ module Test
           end
 
           def finished(elapsed_time)
-            nl if output?(NORMAL) and !output?(VERBOSE)
-            output_faults unless @show_detail_immediately
+            unless @show_detail_immediately
+              nl if output?(NORMAL) and !output?(VERBOSE)
+              output_faults
+            end
             nl(PROGRESS_ONLY)
             change_output_level(IMPORTANT_FAULTS_ONLY) do
               output_statistics(elapsed_time)
@@ -178,22 +182,31 @@ module Test
 
           def output_fault_in_detail(fault)
             if fault.is_a?(Failure) and
-                fault.inspected_expected and fault.inspected_actual
-              output_single("#{fault.label}: ")
-              output(fault.test_name, fault_color(fault))
-              output_fault_backtrace(fault)
-              output_failure_message(fault)
+                fault.inspected_expected and
+                fault.inspected_actual
+              if @reverse_output
+                output_fault_backtrace(fault)
+                output_failure_message(fault)
+                output_single("#{fault.label}: ")
+                output(fault.test_name, fault_color(fault))
+              else
+                output_single("#{fault.label}: ")
+                output(fault.test_name, fault_color(fault))
+                output_fault_backtrace(fault)
+                output_failure_message(fault)
+              end
             else
-              if fault.is_a?(Error)
+              if @reverse_output
+                output_fault_backtrace(fault)
                 output_single("#{fault.label}: ")
                 output_single(fault.test_name, fault_color(fault))
                 output_fault_message(fault)
               else
-                output_single(fault.label, fault_color(fault))
+                output_single("#{fault.label}: ")
+                output_single(fault.test_name, fault_color(fault))
                 output_fault_message(fault)
-                output(fault.test_name)
+                output_fault_backtrace(fault)
               end
-              output_fault_backtrace(fault)
             end
           end
 
@@ -212,26 +225,47 @@ module Test
           end
 
           def output_fault_backtrace(fault)
-            snippet_is_shown = false
             detector = FaultLocationDetector.new(fault, @code_snippet_fetcher)
             backtrace = fault.location
             # workaround for test-spec. :<
             # see also GitHub:#22
             backtrace ||= []
+
+            code_snippet_backtrace_index = nil
+            code_snippet_lines = nil
             backtrace.each_with_index do |entry, i|
-              output(entry)
-              next if snippet_is_shown
               next unless detector.target?(entry)
               file, line_number, = detector.split_backtrace_entry(entry)
-              snippet_is_shown = output_code_snippet(file, line_number,
-                                                     fault_color(fault))
+              lines = fetch_code_snippet(file, line_number)
+              unless lines.empty?
+                code_snippet_backtrace_index = i
+                code_snippet_lines = lines
+                break
+              end
+            end
+
+            if @reverse_output
+              backtrace.each_with_index.reverse_each do |entry, i|
+                if i == code_snippet_backtrace_index
+                  output_code_snippet(code_snippet_lines, fault_color(fault))
+                end
+                output(entry)
+              end
+            else
+              backtrace.each_with_index do |entry, i|
+                output(entry)
+                if i == code_snippet_backtrace_index
+                  output_code_snippet(code_snippet_lines, fault_color(fault))
+                end
+              end
             end
           end
 
-          def output_code_snippet(file, line_number, target_line_color=nil)
-            lines = @code_snippet_fetcher.fetch(file, line_number)
-            return false if lines.empty?
+          def fetch_code_snippet(file, line_number)
+            @code_snippet_fetcher.fetch(file, line_number)
+          end
 
+          def output_code_snippet(lines, target_line_color=nil)
             max_n = lines.collect {|n, line, attributes| n}.max
             digits = (Math.log10(max_n) + 1).truncate
             lines.each do |n, line, attributes|
@@ -245,7 +279,6 @@ module Test
               output("  %2s %*d: %s" % [current_line_mark, digits, n, line],
                      line_color)
             end
-            true
           end
 
           def output_failure_message(failure)
@@ -303,9 +336,17 @@ module Test
           end
 
           def output_fault_in_short(fault)
-            output_single(fault.message, fault_color(fault))
-            output(" [#{fault.test_name}]")
-            output(fault.location.first)
+            if @reverse_output
+              output(fault.location.first)
+              output_single("#{fault.label}: ")
+              output_single(fault.message, fault_color(fault))
+              output(" [#{fault.test_name}]")
+            else
+              output_single("#{fault.label}: ")
+              output_single(fault.message, fault_color(fault))
+              output(" [#{fault.test_name}]")
+              output(fault.location.first)
+            end
           end
 
           def format_fault(fault)
@@ -330,24 +371,34 @@ module Test
           end
 
           def output_summary_marker
-            term_width = guess_term_width
-            if term_width.zero?
-              marker_width = 6
+            if @progress_row_max > 0
+              output("-" * @progress_row_max, summary_marker_color)
             else
-              marker_width = term_width
+              nl
             end
-            output("-" * marker_width, summary_marker_color)
           end
 
           def test_started(test)
             return unless output?(VERBOSE)
 
-            name = test.name.sub(/\(.+?\)\z/, '')
-            right_space = 8 * 2
+            tab_width = 8
+            name = test.local_name
+            separator = ":"
+            left_used = indent.size + name.size + separator.size
+            right_space = tab_width * 2
             left_space = @progress_row_max - right_space
-            left_space = left_space - indent.size - name.size
-            tab_stop = "\t" * ([left_space - 1, 0].max / 8)
-            output_single("#{indent}#{name}:#{tab_stop}", nil, VERBOSE)
+            if (left_used % tab_width).zero?
+              left_space -= left_used
+              n_tabs = 0
+            else
+              left_space -= ((left_used / tab_width) + 1) * tab_width
+              n_tabs = 1
+            end
+            n_tabs += [left_space, 0].max / tab_width
+            tab_stop = "\t" * n_tabs
+            output_single("#{indent}#{name}#{separator}#{tab_stop}",
+                          nil,
+                          VERBOSE)
             @test_start = Time.now
           end
 
@@ -473,8 +524,12 @@ module Test
             fault_class.name.split(/::/).last.downcase
           end
 
+          def fault_class_color(fault_class)
+            color(fault_class_color_name(fault_class))
+          end
+
           def fault_color(fault)
-            color(fault_class_color_name(fault.class))
+            fault_class_color(fault.class)
           end
 
           def fault_marker_color(fault)

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

@@ -30,16 +30,16 @@ module Test
               location_display = "\n" + failure.location.join("\n")
             end
             result = "#{failure.label}:\n"
-            result << "#{failure.test_name}#{location_display}:\n"
-            result << failure.message
+            result += "#{failure.test_name}#{location_display}:\n"
+            result += failure.message
             result
           end
 
           def format_fault_error(error)
             result = "#{error.label}:\n"
-            result << "#{error.test_name}:\n"
-            result << "#{error.message}\n"
-            result << error.backtrace.join("\n")
+            result += "#{error.test_name}:\n"
+            result += "#{error.message}\n"
+            result += error.backtrace.join("\n")
             result
           end
         end

data/lib/test/unit/util/observable.rb

@@ -26,8 +26,8 @@ module Test
         # returned, making it very easy to use the proc
         # itself as the listener_key:
         #
-        #  listener = add_listener("Channel") { ... }
-        #  remove_listener("Channel", listener)
+        #     listener = add_listener("Channel") { ... }
+        #     remove_listener("Channel", listener)
         def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
           unless(block_given?)
             raise ArgumentError.new("No callback was passed as a listener")

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

@@ -7,10 +7,11 @@ module Test
         # error as string.
         #
         # Example:
-        #   capture_output do
-        #     puts("stdout")
-        #     warn("stderr")
-        #   end # -> ["stdout\n", "stderr\n"]
+        #
+        #     capture_output do
+        #       puts("stdout")
+        #       warn("stderr")
+        #     end # -> ["stdout\n", "stderr\n"]
         def capture_output
           require 'stringio'
 

data/lib/test/unit/util/procwrapper.rb

@@ -31,10 +31,10 @@ module Test
 
         def ==(other)
           case(other)
-            when ProcWrapper
-              return @a_proc == other.to_proc
-            else
-              return super
+          when ProcWrapper
+            return @a_proc == other.to_proc
+          else
+            return super
           end
         end
         alias :eql? :==

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '3.2.0'
+    VERSION = "3.3.6"
   end
 end

data/test/collector/test-descendant.rb

@@ -31,6 +31,8 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       super
 
       @test_case1 = Class.new(Test::Unit::TestCase) do
+        self.test_order = :alphabetic
+
         def self.name
           "test-case1"
         end
@@ -43,6 +45,8 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       end
 
       @test_case2 = Class.new(Test::Unit::TestCase) do
+        self.test_order = :alphabetic
+
         def self.name
           "test-case2"
         end

data/test/collector/test-load.rb

@@ -20,7 +20,9 @@ class TestUnitCollectorLoad < Test::Unit::TestCase
 
   setup
   def setup_top_level_test_cases
-    @test_case1 = @test_dir + "test_case1.rb"
+    @test_case1_base_name = "test_case1.rb"
+
+    @test_case1 = @test_dir + @test_case1_base_name
     @test_case2 = @test_dir + "test_case2.rb"
     @no_load_test_case3 = @test_dir + "case3.rb"
 
@@ -66,10 +68,25 @@ EOT
     @sub_test_dir = @test_dir + "sub"
     @sub_test_dir.mkpath
 
+    @sub_test_case1 = @sub_test_dir + @test_case1_base_name
     @sub_test_case4 = @sub_test_dir + "test_case4.rb"
     @no_load_sub_test_case5 = @sub_test_dir + "case5.rb"
     @sub_test_case6 = @sub_test_dir + "test_case6.rb"
 
+    @sub_test_case1.open("w") do |test_case|
+      test_case.puts(<<-TEST_CASE)
+module #{@temporary_test_cases_module_name}
+  class SubTestCase1 < Test::Unit::TestCase
+    def test1_1
+    end
+
+    def test1_2
+    end
+  end
+end
+      TEST_CASE
+    end
+
     @sub_test_case4.open("w") do |test_case|
       test_case.puts(<<-EOT)
 module #{@temporary_test_cases_module_name}
@@ -271,6 +288,9 @@ EOT
 
   def test_simple_collect
     assert_collect([:suite, {:name => @sub_test_dir.basename.to_s},
+                    [:suite, {:name => _test_case_name("SubTestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
                     [:suite, {:name => _test_case_name("SubTestCase4")},
                      [:test, {:name => "test4_1"}],
                      [:test, {:name => "test4_2"}]],
@@ -302,6 +322,9 @@ EOT
                     [:suite, {:name => _test_case_name("TestCase2")},
                      [:test, {:name => "test2"}]],
                     [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase4")},
                       [:test, {:name => "test4_1"}],
                       [:test, {:name => "test4_2"}]],
@@ -356,6 +379,9 @@ EOT
                     [:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
                      [:test, {:name => "test5_1"}],
                      [:test, {:name => "test5_2"}]],
+                    [:suite, {:name => _test_case_name("SubTestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
                     [:suite, {:name => _test_case_name("SubTestCase4")},
                      [:test, {:name => "test4_1"}],
                      [:test, {:name => "test4_2"}]],
@@ -370,7 +396,11 @@ EOT
     assert_collect([:suite, {:name => "."},
                     [:suite, {:name => _test_case_name("TestCase1")},
                      [:test, {:name => "test1_1"}],
-                     [:test, {:name => "test1_2"}]]]) do |collector|
+                     [:test, {:name => "test1_2"}]],
+                    [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]]]]) do |collector|
       collector.filter = Proc.new do |test|
         !/\Atest1/.match(test.method_name).nil?
       end
@@ -381,6 +411,9 @@ EOT
     test_dirs = [@sub_test_dir.to_s, @sub2_test_dir.to_s]
     assert_collect([:suite, {:name => "[#{test_dirs.join(', ')}]"},
                     [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase4")},
                       [:test, {:name => "test4_1"}],
                       [:test, {:name => "test4_2"}]],

data/test/collector/test_dir.rb

@@ -15,7 +15,7 @@ module Test
               @contents = {'.' => self, '..' => parent}
               instance_eval(&block) if(block)
             end
-            
+
             def file(name, contents)
               @contents[name] = contents
             end
@@ -74,7 +74,7 @@ module Test
           end
 
           attr_reader :object_space
-          
+
           def initialize(&block)
             @root = Directory.new('/', self, &block)
             @pwd = @root
@@ -295,7 +295,7 @@ module Test
           assert_raises(LoadError) do
             fs.require('bogus')
           end
-          
+
           assert(fs.require('test_class1.rb'))
           assert(!fs.require('test_class1.rb'))
           c = []
@@ -345,6 +345,7 @@ module Test
         def create_test(name)
           t = Class.new(TestCase)
           t.class_eval <<-EOC
+            self.test_order = :alphabetic
             def self.name
               "T\#{#{name}}"
             end
@@ -373,7 +374,7 @@ module Test
           expected = TestSuite.new('test_1.rb')
           expected << @t1.suite
           assert_equal(expected, @c.collect('test_1.rb'))
-          
+
           expected = TestSuite.new('t4.rb')
           expected << @t4.suite
           assert_equal(expected, @c.collect('t4.rb'))

data/test/collector/test_objectspace.rb

@@ -11,6 +11,7 @@ module Test
       class TC_ObjectSpace < TestCase
         def setup
           @tc1 = Class.new(TestCase) do
+            self.test_order = :alphabetic
             def self.name
               "tc_1"
             end
@@ -21,6 +22,7 @@ module Test
           end
 
           @tc2 = Class.new(TestCase) do
+            self.test_order = :alphabetic
             def self.name
               "tc_2"
             end
@@ -32,7 +34,7 @@ module Test
             def test_4
             end
           end
- 
+
           @object_space = {Class => [@tc1, @tc2, @no_tc], String => ['']}
           def @object_space.each_object(type)
             self[type].each{|item| yield(item) }
@@ -50,14 +52,14 @@ module Test
         def empty_suite
           TestSuite.new(ObjectSpace::NAME)
         end
-        
+
         def test_basic_collection
           assert_equal(full_suite("name"), @c.collect("name"))
 
           @c.filter = []
           assert_equal(full_suite("name"), @c.collect("name"))
         end
-        
+
         def test_filtered_collection
           @c.filter = proc{false}
           assert_equal(empty_suite, @c.collect)
@@ -76,10 +78,10 @@ module Test
 
           @c.filter = [proc{nil}, proc{false}]
           assert_equal(empty_suite, @c.collect)
-          
+
           @c.filter = [proc{nil}, proc{true}]
           assert_equal(full_suite, @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'))