test-unit 3.3.5 → 3.4.0

data/lib/test/unit/autorunner.rb

@@ -246,54 +246,61 @@ module Test
 
           o.on("-n", "--name=NAME", String,
                "Runs tests matching NAME.",
-               "Use '/PATTERN/' for NAME to use regular expression.") do |name|
-            name = (%r{\A/(.*)/\Z} =~ name ? Regexp.new($1) : name)
+               "Use '/PATTERN/' for NAME to use regular expression.",
+               "Regular expression accepts options.",
+               "Example: '/taRget/i' matches 'target' and 'TARGET'") do |name|
+            name = prepare_name(name)
             @filters << lambda do |test|
-              return true if name === test.method_name
-              return true if name === test.local_name
-              false
+              match_test_name(test, name)
             end
           end
 
           o.on("--ignore-name=NAME", String,
                "Ignores tests matching NAME.",
-               "Use '/PATTERN/' for NAME to use regular expression.") do |n|
-            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
-            case n
-            when Regexp
-              @filters << proc {|t| n =~ t.method_name ? false : true}
-            else
-              @filters << proc {|t| n != t.method_name}
+               "Use '/PATTERN/' for NAME to use regular expression.",
+               "Regular expression accepts options.",
+               "Example: '/taRget/i' matches 'target' and 'TARGET'") do |name|
+            name = prepare_name(name)
+            @filters << lambda do |test|
+              not match_test_name(test, name)
             end
           end
 
           o.on("-t", "--testcase=TESTCASE", String,
                "Runs tests in TestCases matching TESTCASE.",
-               "Use '/PATTERN/' for TESTCASE to use regular expression.") do |n|
-            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+               "Use '/PATTERN/' for TESTCASE to use regular expression.",
+               "Regular expression accepts options.",
+               "Example: '/taRget/i' matches 'target' and 'TARGET'") do |name|
+            name = prepare_name(name)
             @filters << lambda do |test|
-              match_test_case_name(test, n)
+              match_test_case_name(test, name)
             end
           end
 
           o.on("--ignore-testcase=TESTCASE", String,
                "Ignores tests in TestCases matching TESTCASE.",
-               "Use '/PATTERN/' for TESTCASE to use regular expression.") do |n|
-            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+               "Use '/PATTERN/' for TESTCASE to use regular expression.",
+               "Regular expression accepts options.",
+               "Example: '/taRget/i' matches 'target' and 'TARGET'") do |name|
+            name = prepare_name(name)
             @filters << lambda do |test|
-              not match_test_case_name(test, n)
+              not match_test_case_name(test, name)
             end
           end
 
           o.on("--location=LOCATION", String,
                "Runs tests that defined in LOCATION.",
-               "LOCATION is one of PATH:LINE, PATH or LINE") do |location|
-            if /\A\d+\z/ =~ location
+               "LOCATION is one of PATH:LINE, PATH or LINE.") do |location|
+            case location
+            when /\A(\d+)\z/
               path = nil
-              line = location.to_i
+              line = $1.to_i
+            when /:(\d+)\z/
+              path = $PREMATCH
+              line = $1.to_i
             else
-              path, line, = location.split(/:(\d+)/, 2)
-              line = line.to_i unless line.nil?
+              path = location
+              line = nil
             end
             add_location_filter(path, line)
           end
@@ -349,7 +356,7 @@ module Test
           end
 
           o.on("--config=FILE",
-               "Use YAML fomat FILE content as configuration file.") do |file|
+               "Use YAML format FILE content as configuration file.") do |file|
             load_config(file)
           end
 
@@ -456,7 +463,7 @@ module Test
           if key == :arguments
             @default_arguments.concat(value.split)
           else
-            runner_options[key.to_sym] = value
+            runner_options[key] = value
           end
         end
         @runner_options = @runner_options.merge(runner_options)
@@ -496,6 +503,31 @@ module Test
         end
       end
 
+      def prepare_name(name)
+        case name
+        when /\A\/(.*)\/([imx]*)\z/
+          pattern = $1
+          options_raw = $2
+          options = 0
+          options |= Regexp::IGNORECASE if options_raw.include?("i")
+          options |= Regexp::MULTILINE if options_raw.include?("m")
+          options |= Regexp::EXTENDED if options_raw.include?("x")
+          Regexp.new(pattern, options)
+        else
+          name
+        end
+      end
+
+      def match_test_name(test, pattern)
+        return true if pattern === test.method_name
+        return true if pattern === test.local_name
+        if pattern.is_a?(String)
+          return true if pattern === "#{test.class}##{test.method_name}"
+          return true if pattern === "#{test.class}##{test.local_name}"
+        end
+        false
+      end
+
       def match_test_case_name(test, pattern)
         test.class.ancestors.each do |test_class|
           break if test_class == TestCase

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

@@ -5,9 +5,25 @@ module Test
     class ColorScheme
       include Enumerable
 
+      TERM_256 = /
+        [+-]256color|
+        \A(?:
+          alacritty|
+          iTerm\s?\d*\.app|
+          kitty|
+          mintty|
+          ms-terminal|
+          nsterm-build\d+|
+          nsterm|
+          terminator|
+          terminology(?:-[0-9.]+)?|
+          termite|
+          vscode
+        )\z/x
+
       class << self
         def default
-          if available_colors == 256
+          if available_colors >= 256
             default_for_256_colors
           else
             default_for_8_colors
@@ -140,7 +156,9 @@ module Test
 
         def guess_available_colors_from_term_env
           case ENV["TERM"]
-          when /-256color\z/
+          when /[+-]direct/
+            2**24
+          when TERM_256
             256
           else
             nil

data/lib/test/unit/diff.rb

@@ -3,9 +3,8 @@
 # Copyright (c) 2001-2008 Python Software Foundation; All Rights Reserved
 # Copyright (c) 2008-2011 Kouhei Sutou; All Rights Reserved
 #
-# It is free software, and is distributed under the Ruby license, the
-# PSF license and/or LGPLv2.1 or later. See the COPYING file, the PSFL
-# file and the LGPL file.
+# It is free software, and is distributed under (the new Ruby license
+# or BSDL) and the PSF license.
 
 module Test
   module Unit

data/lib/test/unit/runner/console.rb

@@ -1,21 +1,4 @@
 # Copyright (C) 2008-2017  Kouhei Sutou <kou@clear-code.com>
-#
-# License: Ruby OR LGPL-2.1+
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
 
 module Test
   module Unit

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/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.3.5"
+    VERSION = "3.4.0"
   end
 end

data/lib/test/unit/warning.rb

@@ -0,0 +1,3 @@
+if defined?(Warning) and Warning.respond_to?(:[]=)
+  Warning[:deprecated] = true
+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,
@@ -510,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
@@ -571,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
@@ -596,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
@@ -613,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
@@ -627,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
@@ -645,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
 
@@ -869,6 +868,7 @@ EOM
         expected_message = <<-EOM.chomp
 Exception raised:
 RuntimeError(<Error>)
+
 EOM
         check_fail_exception(expected_message) {
           assert_nothing_raised {
@@ -879,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") {
@@ -888,6 +889,7 @@ EOM
         expected_message = <<-EOM.chomp
 Exception raised:
 RuntimeError(<Error>)
+
 EOM
         check_fail_exception(expected_message) {
           assert_nothing_raised(StandardError, RuntimeError) {
@@ -954,16 +956,6 @@ EOM
         end
       end
 
-      def test_assert_not_match_fail_not_regexp
-        check_fail("<REGEXP> in assert_not_match(<REGEXP>, ...) " +
-                    "should be a Regexp.\n" +
-                    "<\"asdf\"> was expected to be instance_of?\n" +
-                    "<Regexp> but was\n" +
-                    "<String>.") do
-          assert_not_match("asdf", "asdf")
-        end
-      end
-
       def test_assert_not_match_fail_match
         check_fail("</string/> was expected to not match\n" +
                     "<\"string\">.") do
@@ -971,6 +963,13 @@ EOM
         end
       end
 
+      def test_assert_not_match_fail_match_string
+        check_fail("</asdf/> was expected to not match\n" +
+                    "<\"asdf\">.") do
+          assert_not_match("asdf", "asdf")
+        end
+      end
+
       def test_assert_not_match_fail_match_with_message
         check_fail("message.\n" +
                     "</string/> was expected to not match\n" +
@@ -1312,7 +1311,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