From 62b55d9483d72a11345300296190b1e9c0ffd652 Mon Sep 17 00:00:00 2001 From: mrkn Date: Fri, 14 Dec 2018 03:33:53 +0000 Subject: Import bigdecimal-1.4.0.pre.20181214a * https://github.com/ruby/bigdecimal/compare/v1.4.0.pre.20181205a..v1.4.0.pre.20181214a git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/bigdecimal/test_bigdecimal.rb | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'test/bigdecimal') diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb index ff295b4270..7623a8b260 100644 --- a/test/bigdecimal/test_bigdecimal.rb +++ b/test/bigdecimal/test_bigdecimal.rb @@ -56,8 +56,8 @@ class TestBigDecimal < Test::Unit::TestCase assert_equal(1234, BigDecimal(" \t\n\r \r1234 \t\n\r \r")) assert_raise(ArgumentError) { BigDecimal("1", -1) } - assert_raise(ArgumentError, /"1__1_1"/) { BigDecimal("1__1_1") } - assert_raise(ArgumentError, /"_1_1_1"/) { BigDecimal("_1_1_1") } + assert_raise_with_message(ArgumentError, /"1__1_1"/) { BigDecimal("1__1_1") } + assert_raise_with_message(ArgumentError, /"_1_1_1"/) { BigDecimal("_1_1_1") } BigDecimal.save_exception_mode do BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false) @@ -88,10 +88,10 @@ class TestBigDecimal < Test::Unit::TestCase BigDecimal.save_exception_mode do BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false) BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false) - assert_raise(ArgumentError, /"Infinity_"/) { BigDecimal("Infinity_") } - assert_raise(ArgumentError, /"+Infinity_"/) { BigDecimal("+Infinity_") } - assert_raise(ArgumentError, /"-Infinity_"/) { BigDecimal("-Infinity_") } - assert_raise(ArgumentError, /"NaN_"/) { BigDecimal("NaN_") } + assert_raise_with_message(ArgumentError, /"Infinity_"/) { BigDecimal("Infinity_") } + assert_raise_with_message(ArgumentError, /"\+Infinity_"/) { BigDecimal("+Infinity_") } + assert_raise_with_message(ArgumentError, /"-Infinity_"/) { BigDecimal("-Infinity_") } + assert_raise_with_message(ArgumentError, /"NaN_"/) { BigDecimal("NaN_") } end end @@ -209,15 +209,21 @@ class TestBigDecimal < Test::Unit::TestCase end def test_s_ver - assert_raise(NoMethodError, /undefined method `ver`/) { BigDecimal.ver } + assert_raise_with_message(NoMethodError, /undefined method `ver'/) { BigDecimal.ver } end def test_s_allocate - assert_raise(NoMethodError, /undefined method `allocate`/) { BigDecimal.allocate } + assert_raise_with_message(NoMethodError, /undefined method `allocate'/) { BigDecimal.allocate } end def test_s_new - assert_raise(NoMethodError, /undefined method `new`/) { BigDecimal.new("1") } + # TODO: BigDecimal.new will be removed on 1.5 + # assert_raise_with_message(NoMethodError, /undefined method `new'/) { BigDecimal.new("1") } + assert_equal(BigDecimal(1), BigDecimal.new(1)) + assert_raise(ArgumentError) { BigDecimal.new(',', exception: true) } + assert_nothing_raised { assert_equal(nil, BigDecimal.new(',', exception: false)) } + assert_raise(TypeError) { BigDecimal.new(nil, exception: true) } + assert_nothing_raised { assert_equal(nil, BigDecimal.new(nil, exception: false)) } end def _test_mode(type) @@ -1821,7 +1827,13 @@ class TestBigDecimal < Test::Unit::TestCase def test_dup_subclass c = Class.new(BigDecimal) - assert_raise(NoMethodError, /undefined method `new`/) { c.new(1) } + # TODO: BigDecimal.new will be removed on 1.5 + # assert_raise_with_message(NoMethodError, /undefined method `new'/) { c.new(1) } + assert_equal(BigDecimal(1), c.new(1)) + assert_raise(ArgumentError) { c.new(',', exception: true) } + assert_nothing_raised { assert_equal(nil, c.new(',', exception: false)) } + assert_raise(TypeError) { c.new(nil, exception: true) } + assert_nothing_raised { assert_equal(nil, c.new(nil, exception: false)) } end def test_to_d -- cgit v1.2.3