diff options
author | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 05:16:04 +0000 |
---|---|---|
committer | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 05:16:04 +0000 |
commit | 6f9c82574aa235ddb5665a54e1214bb2974b2c92 (patch) | |
tree | ab4c9a9fbf96921f1dc22cb613dca0b9ac90e088 | |
parent | 074208d12bdf0696c1eb8416ec2db2d274fa7c23 (diff) | |
download | ruby-6f9c82574aa235ddb5665a54e1214bb2974b2c92.tar.gz |
* test/ruby/test_array.rb (test_sum): add assertions for Rational and
Complex numbers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 24 |
2 files changed, 25 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Apr 15 14:14:00 2016 Kenta Murata <mrkn@mrkn.jp> + + * test/ruby/test_array.rb (test_sum): add assertions for Rational and + Complex numbers. + Fri Apr 15 10:07:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/io/console/console.c (console_key_pressed_p): raise the same diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index ce6b9ceb87..ce8a289a6a 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2714,14 +2714,25 @@ class TestArray < Test::Unit::TestCase FIXNUM_MIN = -(1 << (8 * RbConfig::SIZEOF['long'] - 2)) FIXNUM_MAX = (1 << (8 * RbConfig::SIZEOF['long'] - 2)) - 1 - def assert_int_equal(e, v, msg=nil) - assert_kind_of(Integer, v, msg) + def assert_typed_equal(e, v, cls, msg=nil) + assert_kind_of(cls, v, msg) assert_equal(e, v, msg) end + def assert_int_equal(e, v, msg=nil) + assert_typed_equal(e, v, Integer, msg) + end + + def assert_rational_equal(e, v, msg=nil) + assert_typed_equal(e, v, Rational, msg) + end + def assert_float_equal(e, v, msg=nil) - assert_equal(Float, v.class, msg) - assert_equal(e, v, msg) + assert_typed_equal(e, v, Float, msg) + end + + def assert_complex_equal(e, v, msg=nil) + assert_typed_equal(e, v, Complex, msg) end def test_sum @@ -2729,7 +2740,12 @@ class TestArray < Test::Unit::TestCase assert_int_equal(3, [3].sum) assert_int_equal(8, [3, 5].sum) assert_int_equal(15, [3, 5, 7].sum) + assert_rational_equal(8r, [3, 5r].sum) assert_float_equal(15.0, [3, 5, 7.0].sum) + assert_float_equal(15.0, [3, 5r, 7.0].sum) + assert_complex_equal(8r + 1i, [3, 5r, 1i].sum) + assert_complex_equal(15.0 + 1i, [3, 5r, 7.0, 1i].sum) + assert_int_equal(2*FIXNUM_MAX, Array.new(2, FIXNUM_MAX).sum) assert_int_equal(2*(FIXNUM_MAX+1), Array.new(2, FIXNUM_MAX+1).sum) assert_int_equal(10*FIXNUM_MAX, Array.new(10, FIXNUM_MAX).sum) |