test-unit 3.3.7 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa35cb23e3ed29c4404a4547bafab08b764435c98defa3f630bd651238261f01
-  data.tar.gz: a792423f3928652f0dec87ab0d29b2acdbd1f100c3e62e64db3f57ecb788f918
+  metadata.gz: 4b0ea1c609f04e687f6b9c2bbc5d02efc79b1cf02516ddd36ff73a2cb974a2b0
+  data.tar.gz: 5110042334219485a6e99963685c6a51497509da5ec833516c0fa7a7a6eb0294
 SHA512:
-  metadata.gz: 8ba6bc75724ad5d7919ea7cc23fee209c654443641d4e74a4a070b27a83babe70773538556a4762e35c77adf4bb9016191500c33ea1d4412116003d944528eab
-  data.tar.gz: bf6d06a9591db3d142e10f5924f92ee144c291ad1e083d745533d8b0c57555ffdb1b0fe033cab20ecb9eda4f037c9fe5ec1418176fad0ffd948e6bff48f6373a
+  metadata.gz: 7201589c5975139093ac4618f696ba4f40448f9d4da7e2d437545d3f105563aed379d382ce57fe09ac5b27aa41af235019befaf2a8d96d5dcc6d6609cc13798e
+  data.tar.gz: e65b33f3f9560ad8581987617520b03ccdd63d59d5354546663fc0898209b3bbcebdc471c2afca5c2112897d34ad6d933f7ef416f2d6ccaad805f45b0a17a24b

data/doc/text/news.md

@@ -1,5 +1,49 @@
 # News
 
+## 3.4.2 - 2021-05-30 {#version-3-4-2}
+
+### Improvements
+
+  * [UI][console]: Improved diff readability for no color
+    case. Character based diff marks are always showed.
+
+## 3.4.1 - 2021-04-19 {#version-3-4-1}
+
+### Fixes
+
+  * Fixed a bug that `setup`/`cleanup`/`teardown` with block may be
+    overwritten by another `setup`/`cleanup`/`teardown` with
+    block. It's caused only with Ruby 2.6 or earlier.
+    [GitHub#179][Reported by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
+## 3.4.0 - 2021-01-30 {#version-3-4-0}
+
+### Improvements
+
+  * Enable deprecated warnings by default.
+
+## 3.3.9 - 2020-12-29 {#version-3-3-9}
+
+### Improvements
+
+  * `assert_not_match`: Add support for `String` as pattern.
+    [GitHub#178][Patch by David Rodríguez]
+
+### Thanks
+
+  * David Rodríguez
+
+## 3.3.8 - 2020-12-25 {#version-3-3-8}
+
+### Improvements
+
+  * [UI][console]: Removed reverse mode because Ruby 3.0 reverts
+    reverse backtrace.
+
 ## 3.3.7 - 2020-11-18 {#version-3-3-7}
 
 ### Improvements

data/lib/test-unit.rb

@@ -1,5 +1,7 @@
 # Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
 
+require "test/unit/warning"
+
 module Test
   module Unit
     autoload :TestCase, "test/unit/testcase"

data/lib/test/unit.rb

@@ -1,3 +1,5 @@
+require "test/unit/warning"
+
 require 'test/unit/testcase'
 require 'test/unit/autorunner'
 

data/lib/test/unit/assertions.rb

@@ -534,12 +534,7 @@ EOT
       #   assert_match(/\d+/, 'five, 6, seven')
       def assert_match(pattern, string, message=nil)
         _wrap_assertion do
-          pattern = case(pattern)
-            when String
-              Regexp.new(Regexp.escape(pattern))
-            else
-              pattern
-          end
+          pattern = Regexp.new(Regexp.escape(pattern)) if pattern.is_a?(String)
           full_message = build_message(message,
                                        "<?> was expected to be =~\n<?>.",
                                        pattern, string)
@@ -711,15 +706,13 @@ EOT
       # @example
       #   assert_not_match(/two/, 'one 2 three')   # -> pass
       #   assert_not_match(/three/, 'one 2 three') # -> fail
-      def assert_not_match(regexp, string, message=nil)
+      def assert_not_match(pattern, string, message=nil)
         _wrap_assertion do
-          assert_instance_of(Regexp, regexp,
-                             "<REGEXP> in assert_not_match(<REGEXP>, ...) " +
-                             "should be a Regexp.")
+          pattern = Regexp.new(Regexp.escape(pattern)) if pattern.is_a?(String)
           full_message = build_message(message,
                                        "<?> was expected to not match\n<?>.",
-                                       regexp, string)
-          assert_block(full_message) { regexp !~ string }
+                                       pattern, string)
+          assert_block(full_message) { pattern !~ string }
         end
       end
 

data/lib/test/unit/fixture.rb

@@ -103,6 +103,7 @@ module Test
           @test_case = test_case
           @type = type
           @default_options = default_options
+          @callbacks = {}
           @before_prepend_callbacks = []
           @before_append_callbacks = []
           @after_prepend_callbacks = []
@@ -130,6 +131,11 @@ module Test
             @test_case.attribute(:source_location,
                                  callback.source_location,
                                  method_name)
+            # For Ruby 2.6 or earlier. callback may be GC-ed. If
+            # callback is GC-ed, callback_method_name may be
+            # duplicated because callback_method_name uses callback.object_id.
+            # See also: https://github.com/test-unit/test-unit/issues/179
+            @callbacks[callback] = true
             @test_case.__send__(:define_method, method_name, &callback)
           else
             method_name = method_name_or_callback

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)
@@ -692,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
@@ -721,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
@@ -737,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}"
@@ -757,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/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.3.7"
+    VERSION = "3.4.2"
   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

@@ -956,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
@@ -973,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" +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -164,6 +164,7 @@ files:
 - lib/test/unit/util/output.rb
 - lib/test/unit/util/procwrapper.rb
 - lib/test/unit/version.rb
+- lib/test/unit/warning.rb
 - sample/adder.rb
 - sample/subtracter.rb
 - sample/test_adder.rb
@@ -231,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.