minitest 5.8.5 → 5.9.0

data/test/minitest/test_minitest_mock.rb

@@ -26,7 +26,7 @@ class TestMinitestMock < Minitest::Test
     @mock.foo
     @mock.meaning_of_life
 
-    assert @mock.verify
+    assert_mock @mock
   end
 
   def test_allow_expectations_to_be_added_after_creation
@@ -60,7 +60,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect(:foo, retval)
     mock.foo
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_mock_args_does_not_raise
@@ -71,7 +71,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect(:foo, nil, [arg])
     mock.foo(arg)
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_set_expectation_on_special_methods
@@ -98,14 +98,14 @@ class TestMinitestMock < Minitest::Test
     mock.expect :send, "received send"
     assert_equal "received send", mock.send
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_expectations_can_be_satisfied_via_send
     @mock.send :foo
     @mock.send :meaning_of_life
 
-    assert @mock.verify
+    assert_mock @mock
   end
 
   def test_expectations_can_be_satisfied_via_public_send
@@ -114,7 +114,7 @@ class TestMinitestMock < Minitest::Test
     @mock.public_send :foo
     @mock.public_send :meaning_of_life
 
-    assert @mock.verify
+    assert_mock @mock
   end
 
   def test_blow_up_on_wrong_arguments
@@ -186,7 +186,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect :loose_expectation, true, [Integer]
     mock.loose_expectation 1
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_verify_raises_with_strict_args
@@ -223,7 +223,7 @@ class TestMinitestMock < Minitest::Test
     mock.foo :bar
     mock.foo :baz
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_same_method_expects_blow_up_when_not_all_called
@@ -262,7 +262,7 @@ class TestMinitestMock < Minitest::Test
 
     mock.foo
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_mock_block_is_passed_function_params
@@ -274,7 +274,7 @@ class TestMinitestMock < Minitest::Test
 
     mock.foo arg1, arg2, arg3
 
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_mock_block_is_passed_function_block
@@ -285,7 +285,7 @@ class TestMinitestMock < Minitest::Test
       blk == block
     end
     mock.foo "foo", &block
-    assert mock.verify
+    assert_mock mock
   end
 
   def test_verify_fails_when_mock_block_returns_false
@@ -338,7 +338,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect(:foo, true)
 
     mock.send :foo
-    mock.verify
+    assert_mock mock
   end
 
   def test_mock_called_via___send__
@@ -346,7 +346,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect(:foo, true)
 
     mock.__send__ :foo
-    mock.verify
+    assert_mock mock
   end
 
   def test_mock_called_via_send_with_args
@@ -354,7 +354,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect(:foo, true, [1, 2, 3])
 
     mock.send(:foo, 1, 2, 3)
-    mock.verify
+    assert_mock mock
   end
 
 end

data/test/minitest/{test_minitest_unit.rb → test_minitest_test.rb}

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "pathname"
 require "minitest/metametameta"
 
@@ -249,7 +251,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
         1) Failure:
       #<Class:0xXXX>#test_failure [FILE:LINE]:
-      Failed assertion, no message given.
+      Expected false to be truthy.
 
       2 runs, 2 assertions, 1 failures, 0 errors, 0 skips
     EOM
@@ -284,8 +286,8 @@ class TestMinitestRunner < MetaMetaMetaTestCase
     assert_report expected, %w[--name /some|thing/ --seed 42]
   end
 
-  def assert_filtering name, expected, a = false
-    args = %W[--name #{name} --seed 42]
+  def assert_filtering filter, name, expected, a = false
+    args = %W[--#{filter} #{name} --seed 42]
 
     alpha = Class.new Minitest::Test do
       define_method :test_something do
@@ -318,7 +320,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering "/Beta#test_something/", expected
+    assert_filtering 'name', "/Beta#test_something/", expected
   end
 
   def test_run_filtered_including_suite_name_string
@@ -330,7 +332,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering "Beta#test_something", expected
+    assert_filtering 'name', "Beta#test_something", expected
   end
 
   def test_run_filtered_string_method_only
@@ -342,7 +344,57 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       2 runs, 2 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering "test_something", expected, :pass
+    assert_filtering 'name', "test_something", expected, :pass
+  end
+
+  def test_run_failing_excluded
+    setup_basic_tu
+
+    expected = clean <<-EOM
+      .
+
+      Finished in 0.00
+
+      1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
+    EOM
+
+    assert_report expected, %w[--exclude /failure/ --seed 42]
+  end
+
+  def test_run_filtered_excluding_suite_name
+    expected = clean <<-EOM
+      .
+
+      Finished in 0.00
+
+      1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
+    EOM
+
+    assert_filtering 'exclude', "/Alpha#test_something/", expected
+  end
+
+  def test_run_filtered_excluding_suite_name_string
+    expected = clean <<-EOM
+      .
+
+      Finished in 0.00
+
+      1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
+    EOM
+
+    assert_filtering 'exclude', "Alpha#test_something", expected
+  end
+
+  def test_run_filtered_excluding_string_method_only
+    expected = clean <<-EOM
+
+
+      Finished in 0.00
+
+      0 runs, 0 assertions, 0 failures, 0 errors, 0 skips
+    EOM
+
+    assert_filtering 'exclude', "test_something", expected, :pass
   end
 
   def test_run_passing
@@ -431,7 +483,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       def self.name; "wacky!" end
 
       def self.before_my_suite
-        @reporter.reporters.first.io.puts "Running #{self.name} tests"
+        @reporter.io.puts "Running #{self.name} tests"
         @@foo = 1
       end
 
@@ -730,13 +782,13 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert__triggered
-    util_assert_triggered "Failed assertion, no message given." do
+    assert_triggered "Expected false to be truthy." do
       @tc.assert false
     end
   end
 
   def test_assert__triggered_message
-    util_assert_triggered @zomg do
+    assert_triggered @zomg do
       @tc.assert false, @zomg
     end
   end
@@ -750,7 +802,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_assert_empty_triggered
     @assertion_count = 2
 
-    util_assert_triggered "Expected [1] to be empty." do
+    assert_triggered "Expected [1] to be empty." do
       @tc.assert_empty [1]
     end
   end
@@ -765,7 +817,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     msg = "No visible difference in the Array#inspect output.
            You should look at the implementation of #== on Array or its members.
            [#<Object:0xXXXXXX>]".gsub(/^ +/, "")
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.assert_equal [object1], [object2]
     end
   end
@@ -778,16 +830,49 @@ class TestMinitestUnitTestCase < Minitest::Test
            You should look at the implementation of #== on Hash or its members.
            {1=>#<Object:0xXXXXXX>}".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.assert_equal h1, h2
     end
   end
 
+  def test_assert_equal_string_encodings
+    msg = <<-EOM.gsub(/^ {10}/, "")
+          --- expected
+          +++ actual
+          @@ -1 +1,2 @@
+          +# encoding: ASCII-8BIT
+           "bad-utf8-\\xF1.txt"
+          EOM
+
+    assert_triggered msg do
+      x = "bad-utf8-\xF1.txt"
+      y = x.dup.force_encoding "binary" # TODO: switch to .b when 1.9 dropped
+      @tc.assert_equal x, y
+    end
+  end unless RUBY18
+
+  def test_assert_equal_string_encodings_both_different
+    msg = <<-EOM.gsub(/^ {10}/, "")
+          --- expected
+          +++ actual
+          @@ -1,2 +1,2 @@
+          -# encoding: US-ASCII
+          +# encoding: ASCII-8BIT
+           "bad-utf8-\\xF1.txt"
+          EOM
+
+    assert_triggered msg do
+      x = "bad-utf8-\xF1.txt".force_encoding "ASCII"
+      y = x.dup.force_encoding "binary" # TODO: switch to .b when 1.9 dropped
+      @tc.assert_equal x, y
+    end
+  end unless RUBY18
+
   def test_assert_equal_different_diff_deactivated
     skip "https://github.com/MagLev/maglev/issues/209" if maglev?
 
     without_diff do
-      util_assert_triggered util_msg("haha" * 10, "blah" * 10) do
+      assert_triggered util_msg("haha" * 10, "blah" * 10) do
         o1 = "haha" * 10
         o2 = "blah" * 10
 
@@ -810,7 +895,7 @@ class TestMinitestUnitTestCase < Minitest::Test
            +#<#<Class:0xXXXXXX>:0xXXXXXX @name=\"b\">
            ".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.assert_equal o1, o2
     end
   end
@@ -823,7 +908,7 @@ class TestMinitestUnitTestCase < Minitest::Test
            You should look at the implementation of #== on Object or its members.
            #<Object:0xXXXXXX>".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.assert_equal o1, o2
     end
   end
@@ -836,7 +921,7 @@ class TestMinitestUnitTestCase < Minitest::Test
            +\"blahblahblahblahblahblahblahblahblahblah\"
            ".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       o1 = "haha" * 10
       o2 = "blah" * 10
 
@@ -849,7 +934,7 @@ class TestMinitestUnitTestCase < Minitest::Test
            You should look at the implementation of #== on String or its members.
            \"blahblahblahblahblahblahblahblahblahblah\"".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       o1 = "blah" * 10
       o2 = "blah" * 10
       def o1.== _
@@ -868,7 +953,7 @@ class TestMinitestUnitTestCase < Minitest::Test
            +\"blahblahblahblahblahblahblahblahblahblah\"
            ".gsub(/^ +/, "")
 
-    util_assert_triggered msg do
+    assert_triggered msg do
       o1 = "haha" * 10
       o2 = "blah" * 10
       @tc.assert_equal o1, o2, "message"
@@ -876,20 +961,20 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_equal_different_short
-    util_assert_triggered util_msg(1, 2) do
+    assert_triggered util_msg(1, 2) do
       @tc.assert_equal 1, 2
     end
   end
 
   def test_assert_equal_different_short_msg
-    util_assert_triggered util_msg(1, 2, "message") do
+    assert_triggered util_msg(1, 2, "message") do
       @tc.assert_equal 1, 2, "message"
     end
   end
 
   def test_assert_equal_different_short_multiline
     msg = "--- expected\n+++ actual\n@@ -1,2 +1,2 @@\n \"a\n-b\"\n+c\"\n"
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.assert_equal "a\nb", "a\nc"
     end
   end
@@ -903,14 +988,14 @@ class TestMinitestUnitTestCase < Minitest::Test
 
     @tc.assert_in_delta 0, 1, 1
 
-    util_assert_triggered "Expected |0 - 1| (1) to not be <= 1." do
+    assert_triggered "Expected |0 - 1| (1) to not be <= 1." do
       @tc.refute_in_delta 0, 1, 1
     end
   end
 
   def test_assert_in_delta_triggered
     x = maglev? ? "9.999999xxxe-07" : "1.0e-06"
-    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to be <= #{x}." do
+    assert_triggered "Expected |0.0 - 0.001| (0.001) to be <= #{x}." do
       @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
     end
   end
@@ -938,13 +1023,13 @@ class TestMinitestUnitTestCase < Minitest::Test
     @tc.assert_in_epsilon 1.0, 1.001
 
     msg = "Expected |1.0 - 1.001| (0.000999xxx) to not be <= 0.001."
-    util_assert_triggered msg do
+    assert_triggered msg do
       @tc.refute_in_epsilon 1.0, 1.001
     end
   end
 
   def test_assert_in_epsilon_triggered
-    util_assert_triggered "Expected |10000 - 9990| (10) to be <= 9.99." do
+    assert_triggered "Expected |10000 - 9990| (10) to be <= 9.99." do
       @tc.assert_in_epsilon 10_000, 9990
     end
   end
@@ -952,7 +1037,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_assert_in_epsilon_triggered_negative_case
     x = (RUBY18 and not maglev?) ? "0.1" : "0.100000xxx"
     y = maglev? ? "0.100000xxx" : "0.1"
-    util_assert_triggered "Expected |-1.1 - -1| (#{x}) to be <= #{y}." do
+    assert_triggered "Expected |-1.1 - -1| (#{x}) to be <= #{y}." do
       @tc.assert_in_epsilon(-1.1, -1, 0.1)
     end
   end
@@ -979,7 +1064,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_instance_of_triggered
-    util_assert_triggered 'Expected "blah" to be an instance of Array, not String.' do
+    assert_triggered 'Expected "blah" to be an instance of Array, not String.' do
       @tc.assert_instance_of Array, "blah"
     end
   end
@@ -989,7 +1074,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_kind_of_triggered
-    util_assert_triggered 'Expected "blah" to be a kind of Array, not String.' do
+    assert_triggered 'Expected "blah" to be a kind of Array, not String.' do
       @tc.assert_kind_of Array, "blah"
     end
   end
@@ -1024,14 +1109,14 @@ class TestMinitestUnitTestCase < Minitest::Test
     def pattern.=~(_) false end
     def pattern.inspect; "[Object]" end
 
-    util_assert_triggered "Expected [Object] to match 5." do
+    assert_triggered "Expected [Object] to match 5." do
       @tc.assert_match pattern, 5
     end
   end
 
   def test_assert_match_triggered
     @assertion_count = 2
-    util_assert_triggered 'Expected /\d+/ to match "blah blah blah".' do
+    assert_triggered 'Expected /\d+/ to match "blah blah blah".' do
       @tc.assert_match(/\d+/, "blah blah blah")
     end
   end
@@ -1041,7 +1126,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_nil_triggered
-    util_assert_triggered "Expected 42 to be nil." do
+    assert_triggered "Expected 42 to be nil." do
       @tc.assert_nil 42
     end
   end
@@ -1058,7 +1143,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_operator_triggered
-    util_assert_triggered "Expected 2 to be < 1." do
+    assert_triggered "Expected 2 to be < 1." do
       @tc.assert_operator 2, :<, 1
     end
   end
@@ -1102,7 +1187,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_output_triggered_both
-    util_assert_triggered util_msg("blah", "blah blah", "In stderr") do
+    assert_triggered util_msg("blah", "blah blah", "In stderr") do
       @tc.assert_output "yay", "blah" do
         print "boo"
         $stderr.print "blah blah"
@@ -1111,7 +1196,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_output_triggered_err
-    util_assert_triggered util_msg("blah", "blah blah", "In stderr") do
+    assert_triggered util_msg("blah", "blah blah", "In stderr") do
       @tc.assert_output nil, "blah" do
         $stderr.print "blah blah"
       end
@@ -1119,7 +1204,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_output_triggered_out
-    util_assert_triggered util_msg("blah", "blah blah", "In stdout") do
+    assert_triggered util_msg("blah", "blah blah", "In stdout") do
       @tc.assert_output "blah" do
         print "blah blah"
       end
@@ -1131,7 +1216,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_predicate_triggered
-    util_assert_triggered 'Expected "blah" to be empty?.' do
+    assert_triggered 'Expected "blah" to be empty?.' do
       @tc.assert_predicate "blah", :empty?
     end
   end
@@ -1185,7 +1270,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_assert_raises_skip
     @assertion_count = 0
 
-    util_assert_triggered "skipped", Minitest::Skip do
+    assert_triggered "skipped", Minitest::Skip do
       @tc.assert_raises ArgumentError do
         begin
           raise "blah"
@@ -1310,7 +1395,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_respond_to_triggered
-    util_assert_triggered 'Expected "blah" (String) to respond to #rawr!.' do
+    assert_triggered 'Expected "blah" (String) to respond to #rawr!.' do
       @tc.assert_respond_to "blah", :rawr!
     end
   end
@@ -1327,14 +1412,14 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_assert_same_triggered
     @assertion_count = 2
 
-    util_assert_triggered "Expected 2 (oid=N) to be the same as 1 (oid=N)." do
+    assert_triggered "Expected 2 (oid=N) to be the same as 1 (oid=N)." do
       @tc.assert_same 1, 2
     end
 
     s1 = "blah"
     s2 = "blah"
 
-    util_assert_triggered 'Expected "blah" (oid=N) to be the same as "blah" (oid=N).' do
+    assert_triggered 'Expected "blah" (oid=N) to be the same as "blah" (oid=N).' do
       @tc.assert_same s1, s2
     end
   end
@@ -1344,7 +1429,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_send_bad
-    util_assert_triggered "Expected 1.>(*[2]) to return true." do
+    assert_triggered "Expected 1.>(*[2]) to return true." do
       @tc.assert_send [1, :>, 2]
     end
   end
@@ -1358,7 +1443,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_silent_triggered_err
-    util_assert_triggered util_msg("", "blah blah", "In stderr") do
+    assert_triggered util_msg("", "blah blah", "In stderr") do
       @tc.assert_silent do
         $stderr.print "blah blah"
       end
@@ -1368,7 +1453,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_assert_silent_triggered_out
     @assertion_count = 2
 
-    util_assert_triggered util_msg("", "blah blah", "In stdout") do
+    assert_triggered util_msg("", "blah blah", "In stdout") do
       @tc.assert_silent do
         print "blah blah"
       end
@@ -1382,7 +1467,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_throws_different
-    util_assert_triggered "Expected :blah to have been thrown, not :not_blah." do
+    assert_triggered "Expected :blah to have been thrown, not :not_blah." do
       @tc.assert_throws :blah do
         throw :not_blah
       end
@@ -1390,7 +1475,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_assert_throws_unthrown
-    util_assert_triggered "Expected :blah to have been thrown." do
+    assert_triggered "Expected :blah to have been thrown." do
       @tc.assert_throws :blah do
         # do nothing
       end
@@ -1434,7 +1519,7 @@ class TestMinitestUnitTestCase < 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
-                 assert_silent assert_throws]
+                 assert_silent assert_throws assert_mock]
 
     # These are test/unit methods. I'm not actually sure why they're still here
     ignores += %w[assert_no_match assert_not_equal assert_not_nil
@@ -1449,13 +1534,13 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_flunk
-    util_assert_triggered "Epic Fail!" do
+    assert_triggered "Epic Fail!" do
       @tc.flunk
     end
   end
 
   def test_flunk_message
-    util_assert_triggered @zomg do
+    assert_triggered @zomg do
       @tc.flunk @zomg
     end
   end
@@ -1476,13 +1561,13 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_message_message
-    util_assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+    assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
       @tc.assert_equal 1, 2, message { "whoops" }
     end
   end
 
   def test_message_lambda
-    util_assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+    assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
       @tc.assert_equal 1, 2, lambda { "whoops" }
     end
   end
@@ -1523,7 +1608,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_refute_empty_triggered
     @assertion_count = 2
 
-    util_assert_triggered "Expected [] to not be empty." do
+    assert_triggered "Expected [] to not be empty." do
       @tc.refute_empty []
     end
   end
@@ -1533,7 +1618,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_equal_triggered
-    util_assert_triggered 'Expected "blah" to not be equal to "blah".' do
+    assert_triggered 'Expected "blah" to not be equal to "blah".' do
       @tc.refute_equal "blah", "blah"
     end
   end
@@ -1544,7 +1629,7 @@ class TestMinitestUnitTestCase < Minitest::Test
 
   def test_refute_in_delta_triggered
     x = maglev? ? "0.100000xxx" : "0.1"
-    util_assert_triggered "Expected |0.0 - 0.001| (0.001) to not be <= #{x}." do
+    assert_triggered "Expected |0.0 - 0.001| (0.001) to not be <= #{x}." do
       @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
     end
   end
@@ -1554,7 +1639,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_in_epsilon_triggered
-    util_assert_triggered "Expected |10000 - 9990| (10) to not be <= 10.0." do
+    assert_triggered "Expected |10000 - 9990| (10) to not be <= 10.0." do
       @tc.refute_in_epsilon 10_000, 9990
       flunk
     end
@@ -1582,7 +1667,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_instance_of_triggered
-    util_assert_triggered 'Expected "blah" to not be an instance of String.' do
+    assert_triggered 'Expected "blah" to not be an instance of String.' do
       @tc.refute_instance_of String, "blah"
     end
   end
@@ -1592,7 +1677,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_kind_of_triggered
-    util_assert_triggered 'Expected "blah" to not be a kind of String.' do
+    assert_triggered 'Expected "blah" to not be a kind of String.' do
       @tc.refute_kind_of String, "blah"
     end
   end
@@ -1614,14 +1699,14 @@ class TestMinitestUnitTestCase < Minitest::Test
     def pattern.=~(_) true end
     def pattern.inspect; "[Object]" end
 
-    util_assert_triggered "Expected [Object] to not match 5." do
+    assert_triggered "Expected [Object] to not match 5." do
       @tc.refute_match pattern, 5
     end
   end
 
   def test_refute_match_triggered
     @assertion_count = 2
-    util_assert_triggered 'Expected /\w+/ to not match "blah blah blah".' do
+    assert_triggered 'Expected /\w+/ to not match "blah blah blah".' do
       @tc.refute_match(/\w+/, "blah blah blah")
     end
   end
@@ -1631,7 +1716,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_nil_triggered
-    util_assert_triggered "Expected nil to not be nil." do
+    assert_triggered "Expected nil to not be nil." do
       @tc.refute_nil nil
     end
   end
@@ -1641,7 +1726,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_predicate_triggered
-    util_assert_triggered 'Expected "" to not be empty?.' do
+    assert_triggered 'Expected "" to not be empty?.' do
       @tc.refute_predicate "", :empty?
     end
   end
@@ -1658,7 +1743,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_operator_triggered
-    util_assert_triggered "Expected 2 to not be > 1." do
+    assert_triggered "Expected 2 to not be > 1." do
       @tc.refute_operator 2, :>, 1
     end
   end
@@ -1668,7 +1753,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_respond_to_triggered
-    util_assert_triggered 'Expected "blah" to not respond to empty?.' do
+    assert_triggered 'Expected "blah" to not respond to empty?.' do
       @tc.refute_respond_to "blah", :empty?
     end
   end
@@ -1678,7 +1763,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_refute_same_triggered
-    util_assert_triggered "Expected 1 (oid=N) to not be the same as 1 (oid=N)." do
+    assert_triggered "Expected 1 (oid=N) to not be the same as 1 (oid=N)." do
       @tc.refute_same 1, 1
     end
   end
@@ -1686,7 +1771,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_skip
     @assertion_count = 0
 
-    util_assert_triggered "haha!", Minitest::Skip do
+    assert_triggered "haha!", Minitest::Skip do
       @tc.skip "haha!"
     end
   end
@@ -1747,7 +1832,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     end
   end
 
-  def util_assert_triggered expected, klass = Minitest::Assertion
+  def assert_triggered expected, klass = Minitest::Assertion
     e = assert_raises klass do
       yield
     end