Imported minitest 1.5.0 r5596

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 33 insertions, 0 deletions

diff --git a/test/minitest/test_mini_test.rb b/test/minitest/test_mini_test.rb
index d8d5dfe7b3..f4c519ac9a 100644
--- a/test/minitest/test_mini_test.rb
+++ b/test/minitest/test_mini_test.rb
@@ -616,6 +616,27 @@ FILE:LINE:in `test_assert_raises_triggered_different'
     assert_equal expected, actual
   end
 
+  def test_assert_raises_triggered_different_msg
+    e = assert_raises MiniTest::Assertion do
+      @tc.assert_raises RuntimeError, "XXX" do
+        raise SyntaxError, "icky"
+      end
+    end
+
+    expected = "XXX
+[RuntimeError] exception expected, not
+Class: <SyntaxError>
+Message: <\"icky\">
+---Backtrace---
+FILE:LINE:in `test_assert_raises_triggered_different_msg'
+---------------"
+
+    actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
+    actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
+
+    assert_equal expected, actual
+  end
+
   def test_assert_raises_triggered_none
     e = assert_raises MiniTest::Assertion do
       @tc.assert_raises MiniTest::Assertion do
@@ -628,6 +649,18 @@ FILE:LINE:in `test_assert_raises_triggered_different'
     assert_equal expected, e.message
   end
 
+  def test_assert_raises_triggered_none_msg
+    e = assert_raises MiniTest::Assertion do
+      @tc.assert_raises MiniTest::Assertion, "XXX" do
+        # do nothing
+      end
+    end
+
+    expected = "XXX\nMiniTest::Assertion expected but nothing was raised."
+
+    assert_equal expected, e.message
+  end
+
   def test_assert_raises_triggered_subclass
     e = assert_raises MiniTest::Assertion do
       @tc.assert_raises StandardError do