From c3d2e4d381a06f262c3096b3bdad87ce3948c677 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 2 Apr 2008 14:13:53 +0000 Subject: * numeric.c (num_rdiv): should always return rational number. * rational.c (nurat_add, nurat_sub, nurat_mul, nurat_fdiv, nurat_cmp): use rb_num_coerce_bin(). * rational.c (nurat_division): does / and rdiv. * .gdbinit (rp): no longer use rb_p(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_bignum.rb | 2 +- test/ruby/test_numeric.rb | 11 +---------- test/ruby/test_rational.rb | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'test') diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb index 85ee5eea5f..298c64d3c9 100644 --- a/test/ruby/test_bignum.rb +++ b/test/ruby/test_bignum.rb @@ -262,7 +262,7 @@ class TestBignum < Test::Unit::TestCase assert_equal(T32.to_f, T32.quo(1.0)) assert_equal(T32.to_f, T32.quo(T_ONE)) - assert_raise(TypeError) { T32.quo("foo") } + assert_raise(ArgumentError) { T32.quo("foo") } assert_equal(1024**1024, (1024**1024).quo(1)) assert_equal(1024**1024, (1024**1024).quo(1.0)) diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 8f478bd2c6..1ce608776d 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -51,16 +51,7 @@ class TestNumeric < Test::Unit::TestCase end def test_quo - DummyNumeric.class_eval do - def /(x); :div; end - end - - assert_equal(:div, DummyNumeric.new.quo(0)) - - ensure - DummyNumeric.class_eval do - remove_method :/ - end + assert_raise(ArgumentError) {DummyNumeric.new.quo(0)} end def test_divmod diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 8062d3fad1..899ecf5022 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -943,7 +943,7 @@ class Rational_Test < Test::Unit::TestCase assert_equal(Rational(1,2), 1.quo(2)) assert_equal(Rational(5000000000), 10000000000.quo(2)) - assert_equal(0.5, 1.0.quo(2)) + assert_equal(Rational(1,2), 1.0.quo(2)) assert_equal(Rational(1,4), Rational(1,2).quo(2)) assert_equal(Rational(1,2), 1.rdiv(2)) -- cgit v1.2.3