test-unit 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0ea1c609f04e687f6b9c2bbc5d02efc79b1cf02516ddd36ff73a2cb974a2b0
-  data.tar.gz: 5110042334219485a6e99963685c6a51497509da5ec833516c0fa7a7a6eb0294
+  metadata.gz: '096e65b8d56779e795090f5e56e10a10bcef4f666f45702da71acb1e0e0e769e'
+  data.tar.gz: 31402966d552fe2c7cd960185929963e7358296e9ff5727be4c7a72781d070b7
 SHA512:
-  metadata.gz: 7201589c5975139093ac4618f696ba4f40448f9d4da7e2d437545d3f105563aed379d382ce57fe09ac5b27aa41af235019befaf2a8d96d5dcc6d6609cc13798e
-  data.tar.gz: e65b33f3f9560ad8581987617520b03ccdd63d59d5354546663fc0898209b3bbcebdc471c2afca5c2112897d34ad6d933f7ef416f2d6ccaad805f45b0a17a24b
+  metadata.gz: e46ad14d93dadac17224d10ab58617acc4dfaae61f06067c400308d9c1b3ad060201e88a7fd097d94d93c053a1d5bed0a9f56e765bb573fe960c7086251a891c
+  data.tar.gz: cfa5f1b593e993ff2643cab4989428817fdae1258a357797b2e42d0d563022351349eb3648056305df8ddb6f5e9847a1084646f2edec93b7a1c519bba96c9d11

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 3.4.3 - 2021-06-04 {#version-3-4-3}
+
+### Improvements
+
+  * Stopped to change result value of `Test::Unit::TestCase#include`.
+
+  * Added `assert_all?`.
+
+  * Added support for `assert_raise_with_message`.
+
 ## 3.4.2 - 2021-05-30 {#version-3-4-2}
 
 ### Improvements

data/lib/test/unit/assertions.rb

@@ -289,6 +289,71 @@ EOT
       # Just for minitest compatibility. :<
       alias_method :assert_raises, :assert_raise
 
+      # Passes if the block raises `expected_exception` with
+      # `expected_message`. `expected_message` can be a `String` or
+      # `Regexp`.
+      #
+      # @example Pass pattern: String
+      #   assert_raise_with_message(RuntimeError, "Boom!!!") do
+      #     raise "Boom!!!"
+      #   end # -> pass
+      #
+      # @example Pass pattern: Regexp
+      #   assert_raise_with_message(RuntimeError, /!!!/) do
+      #     raise "Boom!!!"
+      #   end # -> pass
+      #
+      # @example Failure pattern: Exception class isn't matched
+      #   assert_raise_with_message(RuntimeError, "Boom!!!") do
+      #     raise ArgumentError, "Boom!!!"
+      #   end # -> failure
+      #
+      # @example Failure pattern: Exception message isn't matched
+      #   assert_raise_with_message(RuntimeError, "Boom!!!") do
+      #     raise "Hello"
+      #   end # -> failure
+      #
+      # @since 3.4.3
+      def assert_raise_with_message(expected_exception_class,
+                                    expected_message,
+                                    message=nil,
+                                    &block)
+        assert_expected_exception = Proc.new do |*_args|
+          _message, assert_exception_helper, actual_exception = _args
+          diff = AssertionMessage.delayed_diff([
+                                                 expected_exception_class,
+                                                 expected_message,
+                                               ],
+                                               [
+                                                 actual_exception.class,
+                                                 actual_exception.message,
+                                               ])
+          full_message = build_message(message,
+                                       "<?>(<?>) exception expected but was\n" +
+                                       "<?>(<?>).?",
+                                       expected_exception_class,
+                                       expected_message,
+                                       actual_exception.class,
+                                       actual_exception.message,
+                                       diff)
+          begin
+            assert_block(full_message) do
+              assert_exception_helper.expected?(actual_exception) and
+                expected_message === actual_exception.message
+            end
+          rescue AssertionFailedError => failure
+            _set_failed_information(failure,
+                                    expected_exception_class,
+                                    actual_exception)
+            raise failure # For JRuby. :<
+          end
+          actual_exception
+        end
+        args = [expected_exception_class]
+        args << message if message
+        _assert_raise(assert_expected_exception, *args, &block)
+      end
+
       ##
       # Passes if the block raises one of the given
       # exceptions or sub exceptions of the given exceptions.
@@ -1612,6 +1677,53 @@ EOT
       # @since 3.0.0
       alias_method :refute_empty, :assert_not_empty
 
+      # @overload assert_all?(collection, message=nil, &block)
+      #
+      #   Asserts that all `block.call(item)` where `item` is each
+      #   item in `collection` are not false nor nil.
+      #
+      #   If `collection` is empty, this assertion is always passed
+      #   with any `block`.
+      #
+      #   @example Pass patterns
+      #     assert_all?([1, 2, 3]) {|item| item > 0} # => pass
+      #     assert_all?([1, 2, 3], &:positive?)      # => pass
+      #     assert_all?([]) {|item| false}           # => pass
+      #
+      #   @example Failure pattern
+      #     assert_all?([0, 1, 2], &:zero?) # => failure
+      #
+      #   @param [#each] collection The check target.
+      #   @param [String] message The additional user message. It is
+      #     showed when the assertion is failed.
+      #   @yield [Object] Give each item in `collection` to the block.
+      #   @yieldreturn [Object] The checked object.
+      #   @return [void]
+      #
+      # @since 3.4.3
+      def assert_all?(collection, message=nil)
+        _wrap_assertion do
+          failed = false
+          result = {}
+          collection.each do |item|
+            element_result = yield(item)
+            failed = true unless element_result
+            result[item] = element_result
+          end
+          format = <<-FORMAT
+<?> was expected to be all true values with the given block but was
+<?>
+          FORMAT
+          full_message = build_message(message,
+                                       format,
+                                       collection,
+                                       result)
+          assert_block(full_message) do
+            not failed
+          end
+        end
+      end
+
       ##
       # Builds a failure message.  `user_message` is added before the
       # `template` and `arguments` replaces the '?'s positionally in

data/lib/test/unit/testcase.rb

@@ -131,12 +131,13 @@ module Test
         end
 
         def include(*modules, &block) # :nodoc:
-          super
+          result = super
           modules.each do |mod|
             mod.public_instance_methods(false).each do |method_name|
               AutoRunnerLoader.check(self, method_name.to_s)
             end
           end
+          result
         end
 
         @@added_method_names = {}

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.4.2"
+    VERSION = "3.4.3"
   end
 end

data/test/test-assertions.rb

@@ -98,7 +98,8 @@ module Test
 
       def check_fail_exception(expected_message, options={}, &proc)
         normalizer = lambda do |actual_message|
-          actual_message.gsub(/^(?:<internal:core> )?[^:\n]+:\d+:.+\n/, "")
+          actual_message.gsub(/^(?:[a-zA-Z]:|<internal:core> )?[^:\n]+:\d+:.+\n/,
+                              "")
         end
         check_assertions(true,
                          options.merge(:expected_message => expected_message,
@@ -1606,6 +1607,66 @@ MESSAGE
       end
     end
 
+    class TestAssertRaiseWithMessage < Test::Unit::TestCase
+      include AssertionCheckable
+
+      def test_pass_string
+        check_nothing_fails(true) do
+          assert_raise_with_message(RuntimeError, "Boom!!!") do
+            raise "Boom!!!"
+          end
+        end
+      end
+
+      def test_pass_regexp
+        check_nothing_fails(true) do
+          assert_raise_with_message(RuntimeError, /!!!/) do
+            raise "Boom!!!"
+          end
+        end
+      end
+
+      def test_pass_message
+        check_nothing_fails(true) do
+          assert_raise_with_message(RuntimeError, "Boom!!!", "message") do
+            raise "Boom!!!"
+          end
+        end
+      end
+
+      def test_fail_unmatch_class
+        expected_message = <<-MESSAGE.chomp
+message.
+<LoadError>(<"Boom!!!">) exception expected but was
+<RuntimeError>(<"Boom!!!">).
+
+diff:
+- [LoadError, "Boom!!!"]
+?  ^^^^
++ [RuntimeError, "Boom!!!"]
+?  ^^^^^^^
+        MESSAGE
+        check_fail(expected_message) do
+          assert_raise_with_message(LoadError, "Boom!!!", "message") do
+            raise "Boom!!!"
+          end
+        end
+      end
+
+      def test_fail_unmatch_message
+        expected_message = <<-MESSAGE.chomp
+message.
+<RuntimeError>(</Hello/>) exception expected but was
+<RuntimeError>(<"Boom!!!">).
+        MESSAGE
+        check_fail(expected_message) do
+          assert_raise_with_message(RuntimeError, /Hello/, "message") do
+            raise "Boom!!!"
+          end
+        end
+      end
+    end
+
     class TestAssertInDelta < TestCase
       include AssertionCheckable
 
@@ -2169,6 +2230,39 @@ EOM
       end
     end
 
+    class TestAssertAll < Test::Unit::TestCase
+      include AssertionCheckable
+
+      def test_pass
+        check_nothing_fails do
+          assert_all?([1, 2]) {|item| item > 0}
+        end
+      end
+
+      def test_pass_message
+        check_nothing_fails do
+          assert_all?([1, 2], "positive") {|item| item > 0}
+        end
+      end
+
+      def test_pass_empty
+        check_nothing_fails do
+          assert_all?([]) {|item| false}
+        end
+      end
+
+      def test_fail
+        expected_message = <<-EOM
+message.
+<[0, 1]> was expected to be all true values with the given block but was
+<{0=>true, 1=>false}>
+EOM
+        check_fail(expected_message.chomp) do
+          assert_all?([0, 1], "message", &:zero?)
+        end
+      end
+    end
+
     class TestTemplate < Test::Unit::TestCase
       def test_incompatible_encoding_by_diff
         need_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert