From 06925a095259693cb3850617e8e01cd1cb3b05d8 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 6 Jan 2010 22:58:07 +0000 Subject: Imported minitest 1.5.0 r5596 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/minitest/test_mini_test.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'test/minitest/test_mini_test.rb') 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: +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 -- cgit v1.2.3