test-unit 3.3.3 → 3.3.8

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"

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.3.3"
+    VERSION = "3.3.8"
   end
 end

data/test/test-assertions.rb

@@ -98,7 +98,7 @@ module Test
 
       def check_fail_exception(expected_message, options={}, &proc)
         normalizer = lambda do |actual_message|
-          actual_message.gsub(/(^[^:\n]+:\d+:.+\n?)+\z/, "")
+          actual_message.gsub(/^(?:<internal:core> )?[^:\n]+:\d+:.+\n/, "")
         end
         check_assertions(true,
                          options.merge(:expected_message => expected_message,
@@ -289,14 +289,19 @@ EOM
           end
 
           def test_same_inspected_objects
-            now = Time.now
-            now_without_usec = Time.at(now.to_i)
+            same_inspected_class = Class.new do
+              def inspect
+                "inspected"
+              end
+            end
+            object1 = same_inspected_class.new
+            object2 = same_inspected_class.new
             message = <<-EOM.chomp
-<#{now.inspect}> expected but was
-<#{now.inspect}>.
+<inspected> expected but was
+<inspected>.
 EOM
             check_fail(message) do
-              assert_equal(now, now_without_usec)
+              assert_equal(object1, object2)
             end
           end
 
@@ -505,7 +510,8 @@ EOM
         message = <<-EOM.chomp
 failed assert_raise.
 <ArgumentError> exception expected but was
-<RuntimeError(<Error>)>.
+<RuntimeError(<Error>)
+>.
 EOM
         check_fail_exception(message) do
           assert_raise(ArgumentError, "failed assert_raise") do
@@ -566,7 +572,8 @@ EOM
         message = <<-EOM.chomp
 failed assert_raise.
 <[ArgumentError, TypeError]> exception expected but was
-<RuntimeError(<Error>)>.
+<RuntimeError(<Error>)
+>.
 EOM
         check_fail_exception(message) do
           assert_raise(ArgumentError, TypeError, "failed assert_raise") do
@@ -591,13 +598,8 @@ EOM
 
         message = <<-EOM.chomp
 <RuntimeError(<XXX>)> exception expected but was
-<RuntimeError(<Error>)>.
-
-diff:
-- RuntimeError(<XXX>)
-?               ^^^
-+ RuntimeError(<Error>)
-?               ^^^^^
+<RuntimeError(<Error>)
+>.
 EOM
         check_fail_exception(message) do
           return_value = assert_raise(RuntimeError.new("XXX")) do
@@ -608,7 +610,8 @@ EOM
         different_error_class = Class.new(StandardError)
         message = <<-EOM.chomp
 <#{different_error_class.inspect}(<Error>)> exception expected but was
-<RuntimeError(<Error>)>.
+<RuntimeError(<Error>)
+>.
 EOM
         check_fail_exception(message) do
           assert_raise(different_error_class.new("Error")) do
@@ -622,7 +625,8 @@ EOM
         end
         message = <<-EOM.chomp
 <DifferentError: "Error"> exception expected but was
-<RuntimeError(<Error>)>.
+<RuntimeError(<Error>)
+>.
 EOM
         check_fail_exception(message) do
           assert_raise(different_error) do
@@ -640,7 +644,7 @@ EOM
       end
 
       def test_assert_raise_jruby
-        omit("For JRuby") unless Object.const_defined?(:Java)
+        jruby_only_test
 
         exception = Java::JavaLang::StringIndexOutOfBoundsException
 
@@ -864,6 +868,7 @@ EOM
         expected_message = <<-EOM.chomp
 Exception raised:
 RuntimeError(<Error>)
+
 EOM
         check_fail_exception(expected_message) {
           assert_nothing_raised {
@@ -874,6 +879,7 @@ EOM
 failed assert_nothing_raised.
 Exception raised:
 RuntimeError(<Error>)
+
 EOM
         check_fail_exception(expected_message) {
           assert_nothing_raised("failed assert_nothing_raised") {
@@ -883,6 +889,7 @@ EOM
         expected_message = <<-EOM.chomp
 Exception raised:
 RuntimeError(<Error>)
+
 EOM
         check_fail_exception(expected_message) {
           assert_nothing_raised(StandardError, RuntimeError) {
@@ -1307,7 +1314,8 @@ EOM
 
         expected_message = <<-EOM.chomp
 <SystemCallError> family exception expected but was
-<RuntimeError(<XXX>)>.
+<RuntimeError(<XXX>)
+>.
 EOM
         check_fail_exception(expected_message) do
           assert_raise_kind_of(SystemCallError) do

data/test/test-color-scheme.rb

@@ -41,17 +41,23 @@ class TestUnitColorScheme < Test::Unit::TestCase
     Test::Unit::Color.new(name, options)
   end
 
-  class TestFor8Colors < self
+  module CleanEnvironment
     def setup
       @original_term, ENV["TERM"] = ENV["TERM"], nil
       @original_color_term, ENV["COLORTERM"] = ENV["COLORTERM"], nil
+      @original_vte_version, ENV["VTE_VERSION"] = ENV["VTE_VERSION"], nil
       ENV["TERM"] = "xterm"
     end
 
     def teardown
       ENV["TERM"] = @original_term
       ENV["COLORTERM"] = @original_color_term
+      ENV["VTE_VERSION"] = @original_vte_version
     end
+  end
+
+  class TestFor8Colors < self
+    include CleanEnvironment
 
     def test_default
       expected_schema_keys = [
@@ -79,4 +85,39 @@ class TestUnitColorScheme < Test::Unit::TestCase
                    Test::Unit::ColorScheme.default.to_hash.keys.sort)
     end
   end
+
+  class TestGuessAvailableColors < self
+    include CleanEnvironment
+    {
+      "rxvt"                 => 8,
+      "xterm-color"          => 8,
+      "alacritty"            => 256,
+      "iTerm.app"            => 256,
+      "screen-256color"      => 256,
+      "screenxterm-256color" => 256,
+      "tmux-256color"        => 256,
+      "vte-256color"         => 256,
+      "vscode-direct"        => 2**24,
+      "vte-direct"           => 2**24,
+      "xterm-direct"         => 2**24,
+    }.each do |term, colors|
+      data("%20s => %8d" % [term, colors], {term: term, colors: colors})
+    end
+    def test_term_env(data)
+      ENV["TERM"] = data[:term]
+      assert_equal(data[:colors],
+                   Test::Unit::ColorScheme.available_colors,
+                   "Incorrect available_colors for TERM=%s" % [data[:term]])
+    end
+  end
+
+  class TestDefaultScheme < self
+    include CleanEnvironment
+
+    def test_direct_color
+      ENV["TERM"] = "xterm-direct"
+      assert_equal(Test::Unit::ColorScheme.default_for_256_colors,
+                   Test::Unit::ColorScheme.default)
+    end
+  end
 end

data/test/test-test-case.rb

@@ -61,10 +61,15 @@ module Test
         entry.start_with?("kernel/")
       end
 
+      def internal_backtrace_entry?(entry)
+        entry.start_with?("<internal:")
+      end
+
       def normalize_location(location)
         filtered_location = location.reject do |entry|
           jruby_backtrace_entry?(entry) or
-            rubinius_backtrace_entry?(entry)
+            rubinius_backtrace_entry?(entry) or
+            internal_backtrace_entry?(entry)
         end
         filtered_location.collect do |entry|
           entry.sub(/:\d+:/, ":0:")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.8
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -107,9 +107,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- BSDL
 - COPYING
-- GPL
-- LGPL
 - PSFL
 - README.md
 - Rakefile
@@ -213,6 +212,7 @@ files:
 homepage: http://test-unit.github.io/
 licenses:
 - Ruby
+- BSDL
 - PSFL
 metadata:
   source_code_uri: https://github.com/test-unit/test-unit
@@ -231,49 +231,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.
 test_files:
-- test/util/test_procwrapper.rb
-- test/util/test_observable.rb
-- test/util/test-output.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test_backtracefilter.rb
-- test/test-diff.rb
-- test/test-assertions.rb
-- test/testunit-test-util.rb
-- test/run-test.rb
-- test/test-emacs-runner.rb
-- test/test-color.rb
-- test/test-pending.rb
-- test/test-omission.rb
-- test/test-color-scheme.rb
-- test/test-test-result.rb
-- test/test-test-suite.rb
-- test/test-code-snippet.rb
-- test/test-test-case.rb
-- test/test-failure.rb
-- test/fixtures/no-header.csv
+- test/collector/test-descendant.rb
+- test/collector/test-load.rb
+- test/collector/test_dir.rb
+- test/collector/test_objectspace.rb
+- test/fixtures/header-label.csv
 - test/fixtures/header-label.tsv
-- test/fixtures/no-header.tsv
 - test/fixtures/header.csv
-- test/fixtures/header-label.csv
-- test/fixtures/plus.csv
 - test/fixtures/header.tsv
-- test/ui/test_testrunmediator.rb
+- test/fixtures/no-header.csv
+- test/fixtures/no-header.tsv
+- test/fixtures/plus.csv
+- test/run-test.rb
+- test/test-assertions.rb
+- test/test-attribute-matcher.rb
+- test/test-attribute.rb
+- test/test-code-snippet.rb
+- test/test-color-scheme.rb
+- test/test-color.rb
+- test/test-data.rb
+- test/test-diff.rb
+- test/test-emacs-runner.rb
+- test/test-error.rb
+- test/test-failure.rb
+- test/test-fault-location-detector.rb
 - test/test-fixture.rb
+- test/test-notification.rb
+- test/test-omission.rb
+- test/test-pending.rb
 - test/test-priority.rb
+- test/test-test-case.rb
+- test/test-test-result.rb
 - test/test-test-suite-creator.rb
-- test/test-attribute.rb
-- test/test-notification.rb
-- test/test-attribute-matcher.rb
-- test/test-fault-location-detector.rb
-- test/collector/test-descendant.rb
-- test/collector/test_objectspace.rb
-- test/collector/test-load.rb
-- test/collector/test_dir.rb
-- test/test-error.rb
-- test/test-data.rb
+- test/test-test-suite.rb
+- test/testunit-test-util.rb
+- test/ui/test_testrunmediator.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test-output.rb
+- test/util/test_backtracefilter.rb
+- test/util/test_observable.rb
+- test/util/test_procwrapper.rb