From f495fe4fc024c0d398a6291bfdecc7634198a75a Mon Sep 17 00:00:00 2001 From: stomar Date: Sat, 6 May 2017 19:58:12 +0000 Subject: make Integer#{round,floor,ceil,truncate} always return integer * numeric.c (int_round): return integer (self) instead of float for Integer#round with positive ndigits argument, because conversion to float introduces errors for large integers. * numeric.c (int_floor): ditto for Integer#floor. * numeric.c (int_ceil): ditto for Integer#ceil. * numeric.c (int_truncate): ditto for Integer#truncate. * test/ruby/test_integer.rb: adjust test cases and add some more. [ruby-core:80645] [Bug #13420] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_integer.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_integer.rb b/test/ruby/test_integer.rb index db478276c5..9199bc0877 100644 --- a/test/ruby/test_integer.rb +++ b/test/ruby/test_integer.rb @@ -181,8 +181,8 @@ class TestInteger < Test::Unit::TestCase assert_int_equal(11111, 11111.round) assert_int_equal(11111, 11111.round(0)) - assert_float_equal(11111.0, 11111.round(1)) - assert_float_equal(11111.0, 11111.round(2)) + assert_int_equal(11111, 11111.round(1)) + assert_int_equal(11111, 11111.round(2)) assert_int_equal(11110, 11111.round(-1)) assert_int_equal(11100, 11111.round(-2)) @@ -249,14 +249,17 @@ class TestInteger < Test::Unit::TestCase assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1110, 1111_1111_1111_1111_1111_1111_1111_1111.round(-1)) assert_int_equal(-1111_1111_1111_1111_1111_1111_1111_1110, (-1111_1111_1111_1111_1111_1111_1111_1111).round(-1)) + + assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.round(1)) + assert_int_equal(10**400, (10**400).round(1)) end def test_floor assert_int_equal(11111, 11111.floor) assert_int_equal(11111, 11111.floor(0)) - assert_float_equal(11111.0, 11111.floor(1)) - assert_float_equal(11111.0, 11111.floor(2)) + assert_int_equal(11111, 11111.floor(1)) + assert_int_equal(11111, 11111.floor(2)) assert_int_equal(11110, 11110.floor(-1)) assert_int_equal(11110, 11119.floor(-1)) @@ -274,14 +277,17 @@ class TestInteger < Test::Unit::TestCase assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1110, 1111_1111_1111_1111_1111_1111_1111_1111.floor(-1)) assert_int_equal(-1111_1111_1111_1111_1111_1111_1111_1120, (-1111_1111_1111_1111_1111_1111_1111_1111).floor(-1)) + + assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.floor(1)) + assert_int_equal(10**400, (10**400).floor(1)) end def test_ceil assert_int_equal(11111, 11111.ceil) assert_int_equal(11111, 11111.ceil(0)) - assert_float_equal(11111.0, 11111.ceil(1)) - assert_float_equal(11111.0, 11111.ceil(2)) + assert_int_equal(11111, 11111.ceil(1)) + assert_int_equal(11111, 11111.ceil(2)) assert_int_equal(11110, 11110.ceil(-1)) assert_int_equal(11120, 11119.ceil(-1)) @@ -299,14 +305,17 @@ class TestInteger < Test::Unit::TestCase assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1120, 1111_1111_1111_1111_1111_1111_1111_1111.ceil(-1)) assert_int_equal(-1111_1111_1111_1111_1111_1111_1111_1110, (-1111_1111_1111_1111_1111_1111_1111_1111).ceil(-1)) + + assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.ceil(1)) + assert_int_equal(10**400, (10**400).ceil(1)) end def test_truncate assert_int_equal(11111, 11111.truncate) assert_int_equal(11111, 11111.truncate(0)) - assert_float_equal(11111.0, 11111.truncate(1)) - assert_float_equal(11111.0, 11111.truncate(2)) + assert_int_equal(11111, 11111.truncate(1)) + assert_int_equal(11111, 11111.truncate(2)) assert_int_equal(11110, 11110.truncate(-1)) assert_int_equal(11110, 11119.truncate(-1)) @@ -324,6 +333,9 @@ class TestInteger < Test::Unit::TestCase assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1110, 1111_1111_1111_1111_1111_1111_1111_1111.truncate(-1)) assert_int_equal(-1111_1111_1111_1111_1111_1111_1111_1110, (-1111_1111_1111_1111_1111_1111_1111_1111).truncate(-1)) + + assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.truncate(1)) + assert_int_equal(10**400, (10**400).truncate(1)) end MimicInteger = Struct.new(:to_int) -- cgit v1.2.3