test-unit 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7aaedb309f50feea0367554eeef8b79f0daf6edb5c75c4b66df9e990c35d371
-  data.tar.gz: 17bd1f32e290087d6b57cf5337dbd8cc8259896671ef1cc6c23b15579e52698b
+  metadata.gz: fa35cb23e3ed29c4404a4547bafab08b764435c98defa3f630bd651238261f01
+  data.tar.gz: a792423f3928652f0dec87ab0d29b2acdbd1f100c3e62e64db3f57ecb788f918
 SHA512:
-  metadata.gz: d86d52e5ed5bc4930f6b26f76d0294cb2e50261f16495649e75eb79ab2631cd23c2bfd6602ede230384f3971e9f780f87a8324ca15a0b3a09866a1c449641e55
-  data.tar.gz: 26975998cc3e8c4c6e5d372b3d3e51316e2709508fdb5ebd87083dcf658941f4b038bcc4f6e1f714ba891a14c1ccbca5ec5e197065a45163dcfd5861cd5b6c15
+  metadata.gz: 8ba6bc75724ad5d7919ea7cc23fee209c654443641d4e74a4a070b27a83babe70773538556a4762e35c77adf4bb9016191500c33ea1d4412116003d944528eab
+  data.tar.gz: bf6d06a9591db3d142e10f5924f92ee144c291ad1e083d745533d8b0c57555ffdb1b0fe033cab20ecb9eda4f037c9fe5ec1418176fad0ffd948e6bff48f6373a

data/BSDL

@@ -0,0 +1,24 @@
+Copyright (C) 2003-2007 Nathaniel Talbott. All rights reserved.
+Copyright (C) 2008 Ryan Davis. All rights reserved.
+Copyright (C) 2008-2020 Sutou Kouhei. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/COPYING

@@ -2,66 +2,63 @@ test-unit is copyrighted free software by Kouhei Sutou
 <kou@cozmixng.org>, Ryan Davis <ryand-ruby@zenspider.com>
 and Nathaniel Talbott <nathaniel@talbott.ws>.
 
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
 
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
 
-       b) use the modified software only within your corporation or
-          organization.
+   b. use the modified software only within your corporation or
+      organization.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
 
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
 
-       b) accompany the distribution with the machine-readable source of
-	  the software.
+   b. accompany the distribution with the machine-readable source of
+      the software.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
 
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
 
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.
 
 Exceptions
 ----------
 
-  * lib/test/unit/diff.rb: This license, PSF license and/or LGPLv2.1
-    or later
-
-  * lib/test-unit.rb: This license and/or LGPLv2.1 or later
+  * lib/test/unit/diff.rb: This license and PSF license

data/README.md

@@ -51,17 +51,13 @@ If you want to use full test-unit features:
 
 ## License
 
-(The Ruby License)
-
-This software is distributed under the same terms as ruby.
+This software is distributed under either the terms of new Ruby
+License or BSDL. See the file [COPYING](COPYING).
 
 Exception:
 
-  * lib/test/unit/diff.rb is a triple license of the Ruby license,
-    PSF license and LGPLv2.1 or later.
-
-  * lib/test-unit.rb is a dual license of the Ruby license and LGPLv2.1
-    or later.
+  * lib/test/unit/diff.rb is a triple license of (the new Ruby license
+    or BSDL) and PSF license.
 
 ## Authors
 

data/Rakefile

@@ -1,20 +1,6 @@
 # -*- ruby -*-
 #
 # Copyright (C) 2008-2017  Kouhei Sutou <kou@clear-code.com>
-#
-# 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
 
 Encoding.default_internal = "UTF-8" if defined?(Encoding.default_internal)
 

data/doc/text/news.md

@@ -1,5 +1,36 @@
 # News
 
+## 3.3.7 - 2020-11-18 {#version-3-3-7}
+
+### Improvements
+
+  * Improved TruffleRuby support.
+    [GitHub#171][Reported by Benoit Daloze]
+
+  * Removed needless `to_sym`.
+    [GitHub#177][Patch by icm7216]
+
+  * `assert_raise`: Added backtrace for actual error.
+
+  * Improved terminal color availability detection.
+    [GitHub#175][Patch by nicholas a. evans]
+
+  * Changed license to the new Ruby's.
+    [GitHub#174]
+
+### Fixes
+
+  * Fixed a typo in `--help` output:
+    [GitHub#176][Patch by icm7216]
+
+### Thanks
+
+  * Benoit Daloze
+
+  * icm7216
+
+  * nicholas a. evans
+
 ## 3.3.6 - 2020-06-10 {#version-3-3-6}
 
 ### Improvements

data/lib/test-unit.rb

@@ -1,21 +1,4 @@
 # Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
-#
-# License: Ruby's or LGPLv2.1 or later
-#
-# 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/assertions.rb

@@ -2121,7 +2121,14 @@ EOT
 
           def inspect
             if default_inspect?
-              "#{@exception.class.inspect}(<#{@exception.message}>)"
+              inspected = "#{@exception.class.inspect}(<#{@exception.message}>)"
+              unless (@exception.backtrace || []).empty?
+                inspected += "\n"
+                @exception.backtrace.each do |trace|
+                  inspected << "#{trace}\n"
+                end
+              end
+              inspected
             else
               @exception.inspect
             end

data/lib/test/unit/autorunner.rb

@@ -356,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
 
@@ -463,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)

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

@@ -540,13 +540,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.6"
+    VERSION = "3.3.7"
   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,
@@ -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) {
@@ -1312,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