test/unit/assertions/assert_raises_tests.rb in assert-2.19.2 vs test/unit/assertions/assert_raises_tests.rb in assert-2.19.3

- old
+ new

@@ -6,22 +6,22 @@ module Assert::Assertions class AssertRaisesTests < Assert::Context include Assert::Test::TestHelpers desc "`assert_raises`" - subject { + subject do desc = desc1 Factory.test do - assert_raises(StandardError, RuntimeError) { raise(StandardError) } # pass - assert_raises(StandardError, RuntimeError, desc) { raise(Exception) } # fail - assert_raises(RuntimeError, desc) { raise(StandardError) } # fail - assert_raises(RuntimeError, desc) { true } # fail - assert_raises(desc) { true } # fail + assert_raises(StandardError, RuntimeError){ raise(StandardError) } + assert_raises(StandardError, RuntimeError, desc){ raise(Exception) } + assert_raises(RuntimeError, desc){ raise(StandardError) } + assert_raises(RuntimeError, desc){ true } + assert_raises(desc){ true } end - } + end - let(:desc1) { "assert raises fail desc" } + let(:desc1){ "assert raises fail desc" } should "produce results as expected" do subject.run(&test_run_callback) assert_that(test_run_result_count).equals(5) @@ -34,62 +34,69 @@ "#{desc1}\nRuntimeError exception expected, not:", "#{desc1}\nRuntimeError exception expected but nothing raised.", "#{desc1}\nAn exception expected but nothing raised.", ] messages = test_run_results(:fail).map(&:message) - messages.each_with_index{ |msg, n| assert_that(msg).matches(/^#{exp[n]}/) } + messages.each_with_index do |msg, n| + assert_that(msg).matches(/^#{exp[n]}/) + end end should "return any raised exception instance" do error = nil error_msg = Factory.string test = Factory.test do - error = assert_raises(RuntimeError) { raise(RuntimeError, error_msg) } + error = assert_raises(RuntimeError){ raise(error_msg) } end test.run assert_that(error).is_not_nil assert_that(error).is_kind_of(RuntimeError) assert_that(error.message).equals(error_msg) - test = Factory.test { error = assert_raises(RuntimeError) {} } + test = Factory.test{ error = assert_raises(RuntimeError){} } test.run assert_that(error).is_nil end end class AssertNothingRaisedTests < Assert::Context include Assert::Test::TestHelpers desc "`assert_nothing_raised`" - subject { + subject do desc = desc1 Factory.test do - assert_nothing_raised(StandardError, RuntimeError, desc) { raise(StandardError) } # fail - assert_nothing_raised(RuntimeError) { raise(StandardError) } # pass - assert_nothing_raised(desc) { raise(RuntimeError) } # fail - assert_nothing_raised { true } # pass + assert_nothing_raised(StandardError, RuntimeError, desc) do + raise(StandardError) + end + assert_nothing_raised(RuntimeError){ raise(StandardError) } + assert_nothing_raised(desc){ raise(RuntimeError) } + assert_nothing_raised{ true } end - } + end - let(:desc1) { "assert nothing raised fail desc" } + let(:desc1){ "assert nothing raised fail desc" } should "produce results as expected" do subject.run(&test_run_callback) assert_that(test_run_result_count).equals(4) assert_that(test_run_result_count(:pass)).equals(2) assert_that(test_run_result_count(:fail)).equals(2) exp = [ - "#{desc1}\nStandardError or RuntimeError exception not expected, but raised:", + "#{desc1}\nStandardError or RuntimeError exception not expected, "\ + "but raised:", "#{desc1}\nAn exception not expected, but raised:", ] messages = test_run_results(:fail).map(&:message) - messages.each_with_index{ |msg, n| assert_that(msg).matches(/^#{exp[n]}/) } + messages.each_with_index do |msg, n| + assert_that(msg).matches(/^#{exp[n]}/) + end end end end