minitest 5.25.5 → 6.0.6

data/test/minitest/test_minitest_assertions.rb

@@ -142,8 +142,7 @@ class TestMinitestAssertions < Minitest::Test
     exp[1] = Object.new
     act[1] = Object.new
     act_obj = act[1]
-    # TODO: switch to endless when 2.7 is dropped
-    act_obj.define_singleton_method(:inspect) { "#<Object:0xXXXXXX>" }
+    def act_obj.inspect = "#<Object:0xXXXXXX>"
     msg = <<~EOM.chomp % [act]
            No visible difference in the Hash#inspect output.
            You should look at the implementation of #== on Hash or its members.
@@ -166,14 +165,20 @@ class TestMinitestAssertions < Minitest::Test
     end
   end
 
-  def test_assert_equal_different_message
+  def test_assert_equal_string_message
     assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+      @tc.assert_equal 1, 2, "whoops"
+    end
+  end
+
+  def test_assert_equal_different_message
+    assert_triggered "whoops." do
       @tc.assert_equal 1, 2, message { "whoops" }
     end
   end
 
   def test_assert_equal_different_lambda
-    assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+    assert_triggered "whoops" do
       @tc.assert_equal 1, 2, lambda { "whoops" }
     end
   end
@@ -284,26 +289,8 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_equal_does_not_allow_lhs_nil
-    if Minitest::VERSION >= "6" then
-      warn "Time to strip the MT5 test"
-
-      @assertion_count += 1
-      assert_triggered(/Use assert_nil if expecting nil/) do
-        @tc.assert_equal nil, nil
-      end
-    else
-      err_re = /Use assert_nil if expecting nil from .*test_minitest_\w+.rb/
-      err_re = "" if $-w.nil?
-
-      assert_deprecation err_re do
-        @tc.assert_equal nil, nil
-      end
-    end
-  end
-
-  def test_assert_equal_does_not_allow_lhs_nil_triggered
-    assert_triggered "Expected: nil\n  Actual: false" do
-      @tc.assert_equal nil, false
+    assert_triggered(/Use assert_nil if expecting nil/) do
+      @tc.assert_equal nil, nil
     end
   end
 
@@ -318,13 +305,13 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_equal_string_both_escaped_unescaped_newlines
-    msg = <<~EOM
+    msg = <<~'EOM' # NOTE: single quotes on heredoc
           --- expected
           +++ actual
           @@ -1,2 +1 @@
-          -"A\\n
+          -"A\n
           -B"
-          +"A\\n\\\\nB"
+          +"A\n\\nB"
           EOM
 
     assert_triggered msg do
@@ -526,10 +513,14 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_operator
+    @assertion_count += 1
+
     @tc.assert_operator 2, :>, 1
   end
 
   def test_assert_operator_bad_object
+    @assertion_count += 1
+
     bad = Object.new
     def bad.== _; true end
 
@@ -537,6 +528,8 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_operator_triggered
+    @assertion_count += 1
+
     assert_triggered "Expected 2 to be < 1." do
       @tc.assert_operator 2, :<, 1
     end
@@ -718,10 +711,14 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_predicate
+    @assertion_count += 1
+
     @tc.assert_predicate "", :empty?
   end
 
   def test_assert_predicate_triggered
+    @assertion_count += 1
+
     assert_triggered 'Expected "blah" to be empty?.' do
       @tc.assert_predicate "blah", :empty?
     end
@@ -813,6 +810,66 @@ class TestMinitestAssertions < Minitest::Test
     end
   end
 
+  def test_assert_raises__string_msg
+    e = assert_raises Minitest::Assertion do
+      @tc.assert_raises RuntimeError, "assertion message" do
+        raise SomeError, "blah"
+      end
+    end
+
+    expected = <<~EOM.chomp
+      assertion message.
+      [RuntimeError] exception expected, not
+      Class: <SomeError>
+      Message: <"blah">
+      ---Backtrace---
+      FILE:LINE:in 'block in test_assert_raises__string_msg'
+      ---------------
+    EOM
+
+    actual = e.message.gsub(/^.+:\d+/, "FILE:LINE")
+    actual.gsub! RE_LEVELS, "" unless jruby?
+    actual.gsub!(/[`']block in (?:TestMinitestAssertions#)?/, "'block in ")
+
+    assert_equal expected, actual
+  end
+
+  def test_assert_raises__regexp_err
+    @assertion_count = 0
+
+    e = assert_raises TypeError do
+      @tc.assert_raises RuntimeError, %r%does not work%, "assertion message" do
+        raise SomeError, "blah"
+      end
+    end
+
+    expected = <<~EOM.chomp
+      class or module required for rescue clause. Got [RuntimeError, /does not work/]
+    EOM
+
+    actual = e.message
+
+    assert_equal expected, actual
+  end
+
+  def test_assert_raises__regexp_err_default
+    @assertion_count = 0
+
+    e = assert_raises TypeError do
+      @tc.assert_raises %r%does not work% do
+        raise "blah"
+      end
+    end
+
+    expected = <<~EOM.chomp
+      class or module required for rescue clause. Got [/does not work/]
+    EOM
+
+    actual = e.message
+
+    assert_equal expected, actual
+  end
+
   def test_assert_raises_subclass
     @tc.assert_raises StandardError do
       raise AnError
@@ -963,25 +1020,9 @@ class TestMinitestAssertions < Minitest::Test
     end
   end
 
-  def test_assert_send
-    @assertion_count = 0 if error_on_warn?
-    assert_deprecation(/DEPRECATED: assert_send/) do
-      @tc.assert_send [1, :<, 2]
-    end
-  end
-
-  def test_assert_send_bad
-    if error_on_warn? then
-      @assertion_count = 0
-      assert_deprecation(/DEPRECATED: assert_send/) do
-        @tc.assert_send [1, :>, 2]
-      end
-    else
-      assert_triggered "Expected 1.>(*[2]) to return true." do
-        assert_deprecation(/DEPRECATED: assert_send/) do
-          @tc.assert_send [1, :>, 2]
-        end
-      end
+  def test_assert_same__does_not_allow_lhs_nil
+    assert_triggered(/Use assert_nil if expecting nil/) do
+      @tc.assert_same nil, nil
     end
   end
 
@@ -1074,48 +1115,24 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_pattern
-    if RUBY_VERSION > "3" then
-      @tc.assert_pattern do
-        exp = if RUBY_VERSION.start_with? "3.0"
-                "(eval):1: warning: One-line pattern matching is experimental, and the behavior may change in future versions of Ruby!\n"
-              else
-                ""
-              end
-        assert_output nil, exp do
-          eval "[1,2,3] => [Integer, Integer, Integer]" # eval to escape parser for ruby<3
-        end
-      end
-    else
-      @assertion_count = 0
-
-      assert_raises NotImplementedError do
-        @tc.assert_pattern do
-          # do nothing
-        end
+    @tc.assert_pattern do
+      assert_output nil, "" do
+        [1,2,3] => [Integer, Integer, Integer]
       end
     end
   end
 
   def test_assert_pattern_traps_nomatchingpatternerror
-    skip unless RUBY_VERSION > "3"
-    exp = if RUBY_VERSION.start_with? "3.0" then
-            "[1, 2, 3]" # terrible error message!
-          else
-            /length mismatch/
-          end
+    exp = /length mismatch/
 
     assert_triggered exp do
       @tc.assert_pattern do
-        capture_io do # 3.0 is noisy
-          eval "[1,2,3] => [Integer, Integer]" # eval to escape parser for ruby<3
-        end
+        [1,2,3] => [Integer, Integer]
       end
     end
   end
 
   def test_assert_pattern_raises_other_exceptions
-    skip unless RUBY_VERSION >= "3.0"
-
     @assertion_count = 0
 
     assert_raises RuntimeError do
@@ -1126,8 +1143,6 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_assert_pattern_with_no_block
-    skip unless RUBY_VERSION >= "3.0"
-
     assert_triggered "assert_pattern requires a block to capture errors." do
       @tc.assert_pattern
     end
@@ -1168,7 +1183,7 @@ class TestMinitestAssertions < Minitest::Test
 
     # These don't have corresponding refutes _on purpose_. They're
     # useless and will never be added, so don't bother.
-    ignores = %w[assert_output assert_raises assert_send
+    ignores = %w[assert_output assert_raises
                  assert_silent assert_throws assert_mock]
 
     ignores += %w[assert_allocations] # for minitest-gcstats
@@ -1280,12 +1295,16 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_refute_in_epsilon_triggered
-    assert_triggered "Expected |10000 - 9990| (10) to not be <= 10.0." do
-      @tc.refute_in_epsilon 10_000, 9990
+    assert_triggered "Expected |10000 - 9991| (9) to not be <= 9.991." do
+      @tc.refute_in_epsilon 10_000, 9991
       flunk
     end
   end
 
+  def test_refute_in_epsilon_minimum
+    @tc.refute_in_epsilon 10_000, 9990
+  end
+
   def test_refute_includes
     @assertion_count = 2
 
@@ -1365,10 +1384,14 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_refute_operator
+    @assertion_count += 1
+
     @tc.refute_operator 2, :<, 1
   end
 
   def test_refute_operator_bad_object
+    @assertion_count += 1
+
     bad = Object.new
     def bad.== _; true end
 
@@ -1376,44 +1399,28 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_refute_operator_triggered
+    @assertion_count += 1
+
     assert_triggered "Expected 2 to not be > 1." do
       @tc.refute_operator 2, :>, 1
     end
   end
 
   def test_refute_pattern
-    if RUBY_VERSION >= "3.0"
-      @tc.refute_pattern do
-        capture_io do # 3.0 is noisy
-          eval "[1,2,3] => [Integer, Integer, String]"
-        end
-      end
-    else
-      @assertion_count = 0
-
-      assert_raises NotImplementedError do
-        @tc.refute_pattern do
-          eval "[1,2,3] => [Integer, Integer, String]"
-        end
-      end
+    @tc.refute_pattern do
+      [1,2,3] => [Integer, Integer, String]
     end
   end
 
   def test_refute_pattern_expects_nomatchingpatternerror
-    skip unless RUBY_VERSION > "3"
-
     assert_triggered(/NoMatchingPatternError expected, but nothing was raised./) do
       @tc.refute_pattern do
-        capture_io do # 3.0 is noisy
-          eval "[1,2,3] => [Integer, Integer, Integer]"
-        end
+        [1,2,3] => [Integer, Integer, Integer]
       end
     end
   end
 
   def test_refute_pattern_raises_other_exceptions
-    skip unless RUBY_VERSION >= "3.0"
-
     @assertion_count = 0
 
     assert_raises RuntimeError do
@@ -1424,18 +1431,20 @@ class TestMinitestAssertions < Minitest::Test
   end
 
   def test_refute_pattern_with_no_block
-    skip unless RUBY_VERSION >= "3.0"
-
     assert_triggered "refute_pattern requires a block to capture errors." do
       @tc.refute_pattern
     end
   end
 
   def test_refute_predicate
+    @assertion_count += 1
+
     @tc.refute_predicate "42", :empty?
   end
 
   def test_refute_predicate_triggered
+    @assertion_count += 1
+
     assert_triggered 'Expected "" to not be empty?.' do
       @tc.refute_predicate "", :empty?
     end
@@ -1611,10 +1620,10 @@ class TestMinitestAssertionHelpers < Minitest::Test
     assert_equal "blah1.\nblah2.", message("blah1") { "blah2" }.call
 
     message = proc { "blah1" }
-    assert_equal "blah1.\nblah2.", message(message) { "blah2" }.call
+    assert_equal "blah1", message(message) { "blah2" }.call
 
     message = message { "blah1" }
-    assert_equal "blah1.\nblah2.", message(message) { "blah2" }.call
+    assert_equal "blah1.", message(message) { "blah2" }.call
   end
 
   def test_message_deferred

data/test/minitest/test_minitest_benchmark.rb

@@ -25,6 +25,20 @@ class TestMinitestBenchmark < Minitest::Test
     assert_equal ["bench_blah"], c.runnable_methods
   end
 
+  def test_cls_run
+    c = Class.new Minitest::Benchmark do
+      def bench_dummy
+        assert true
+      end
+    end
+
+    reporter = Minitest::StatisticsReporter.new(StringIO.new(+""))
+
+    c.run c, "bench_dummy", reporter
+
+    assert_equal 1, reporter.count
+  end
+
   def test_cls_bench_range
     assert_equal [1, 10, 100, 1_000, 10_000], Minitest::Benchmark.bench_range
   end

data/test/minitest/test_minitest_reporter.rb

@@ -1,5 +1,5 @@
 require "minitest/autorun"
-require "minitest/metametameta"
+require_relative "metametameta"
 require "forwardable"
 
 class FakeTest < Minitest::Test
@@ -29,10 +29,11 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     super
     self.io = StringIO.new(+"")
     self.r  = new_composite_reporter
+    @et = @ft = @pt = @st = @sse = nil
   end
 
   def error_test
-    unless defined? @et then
+    unless @et then
       @et = FakeTest.new :woot
       @et.failures << Minitest::UnexpectedError.new(begin
                                                       raise "no"
@@ -45,7 +46,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def system_stack_error_test
-    unless defined? @sse then
+    unless @sse then
 
       ex = SystemStackError.new
 
@@ -64,7 +65,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def fail_test
-    unless defined? @ft then
+    unless @ft then
       @ft = FakeTest.new :woot
       @ft.failures <<   begin
                           raise Minitest::Assertion, "boo"
@@ -87,7 +88,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def skip_test
-    unless defined? @st then
+    unless @st then
       @st = FakeTest.new :woot
       @st.failures << begin
                         raise Minitest::Skip