test-unit 3.2.9 → 3.5.5

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

@@ -47,8 +47,6 @@ 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
@@ -184,29 +182,15 @@ module Test
             if fault.is_a?(Failure) and
                 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
+              output_single("#{fault.label}: ")
+              output(fault.test_name, fault_color(fault))
+              output_fault_backtrace(fault)
+              output_failure_message(fault)
             else
-              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}: ")
-                output_single(fault.test_name, fault_color(fault))
-                output_fault_message(fault)
-                output_fault_backtrace(fault)
-              end
+              output_single("#{fault.label}: ")
+              output_single(fault.test_name, fault_color(fault))
+              output_fault_message(fault)
+              output_fault_backtrace(fault)
             end
           end
 
@@ -244,19 +228,10 @@ module Test
               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
+            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
@@ -336,17 +311,10 @@ module Test
           end
 
           def output_fault_in_short(fault)
-            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
+            output_single("#{fault.label}: ")
+            output_single(fault.message, fault_color(fault))
+            output(" [#{fault.test_name}]")
+            output(fault.location.first)
           end
 
           def format_fault(fault)
@@ -540,13 +508,28 @@ module Test
             color("#{@result.status}-marker")
           end
 
+          TERM_COLOR_SUPPORT = /
+            color|  # explicitly claims color support in the name
+            direct| # explicitly claims "direct color" (24 bit) support
+            #{ColorScheme::TERM_256}|
+            \Acygwin|
+            \Alinux|
+            \Ansterm-bce|
+            \Ansterm-c-|
+            \Aputty|
+            \Arxvt|
+            \Ascreen|
+            \Atmux|
+            \Axterm
+          /x
+
           def guess_color_availability
             return false unless @output.tty?
             return true if windows? and ruby_2_0_or_later?
             case ENV["TERM"]
             when /(?:term|screen)(?:-(?:256)?color)?\z/
               true
-            when /\Arxvt/
+            when TERM_COLOR_SUPPORT
               true
             else
               return true if ENV["EMACS"] == "t"
@@ -677,6 +660,7 @@ module Test
 
           def diff_line(from_line, to_line)
             to_operations = []
+            mark_operations = []
             from_line, to_line, _operations = line_operations(from_line, to_line)
 
             no_replace = true
@@ -706,11 +690,22 @@ module Test
                     output_single(" " * (from_width - to_width))
                   end
                 end
+                mark_operations << Proc.new do
+                  output_single("?" * from_width,
+                                color("diff-difference-tag"))
+                  if (to_width < from_width)
+                    output_single(" " * (from_width - to_width))
+                  end
+                end
               when :delete
                 output_single(from_line[from_start...from_end],
                               color("diff-deleted"))
                 unless no_replace
                   to_operations << Proc.new {output_single(" " * from_width)}
+                  mark_operations << Proc.new do
+                    output_single("-" * from_width,
+                                  color("diff-deleted"))
+                  end
                 end
               when :insert
                 if no_replace
@@ -722,11 +717,16 @@ module Test
                     output_single(to_line[to_start...to_end],
                                   color("diff-inserted"))
                   end
+                  mark_operations << Proc.new do
+                    output_single("+" * to_width,
+                                  color("diff-inserted"))
+                  end
                 end
               when :equal
                 output_single(from_line[from_start...from_end])
                 unless no_replace
                   to_operations << Proc.new {output_single(" " * to_width)}
+                  mark_operations << Proc.new {output_single(" " * to_width)}
                 end
               else
                 raise "unknown tag: #{tag}"
@@ -742,6 +742,15 @@ module Test
               end
               output("")
             end
+
+            unless mark_operations.empty?
+              output_single("?", color("diff-difference-tag"))
+              output_single(" ")
+              mark_operations.each do |operation|
+                operation.call
+              end
+              output("")
+            end
           end
         end
       end

data/lib/test/unit/util/memory-usage.rb

@@ -0,0 +1,47 @@
+module Test
+  module Unit
+    module Util
+      class MemoryUsage
+        attr_reader :virtual
+        attr_reader :physical
+        def initialize
+          @virtual = nil
+          @physical = nil
+          collect_data
+        end
+
+        def collected?
+          return false if @virtual.nil?
+          return false if @physical.nil?
+          true
+        end
+
+        private
+        def collect_data
+          collect_data_proc
+        end
+
+        def collect_data_proc
+          status_file = "/proc/self/status"
+          return false unless File.exist?(status_file)
+
+          data = File.binread(status_file)
+          data.each_line do |line|
+            case line
+            when /\AVm(Size|RSS):\s*(\d+)\s*kB/
+              name = $1
+              value = Integer($2, 10) * 1024
+              case name
+              when "Size"
+                @virtual = value
+              when "RSS"
+                @physical = value
+              end
+            end
+          end
+          collected?
+        end
+      end
+    end
+  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/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.2.9"
+    VERSION = "3.5.5"
   end
 end

data/lib/test/unit/warning.rb

@@ -0,0 +1,3 @@
+if defined?(Warning) and Warning.respond_to?(:[]=)
+  Warning[:deprecated] = true
+end