From 7b974232fd5458b96996dfd7e3b5420aadb46b01 Mon Sep 17 00:00:00 2001 From: tadf Date: Thu, 18 Jun 2009 13:41:44 +0000 Subject: * rational.c (nurat_s_convert): calls to_r when the given argument is non-integer. * rational.c (nurat_s_convert): raises TypeError when the given argument is nil. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_complex.rb | 4 ++-- test/ruby/test_rational.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb index 39a02044f..846fcf9a3 100644 --- a/test/ruby/test_complex.rb +++ b/test/ruby/test_complex.rb @@ -126,8 +126,8 @@ class Complex_Test < Test::Unit::TestCase if @rational && !@keiju assert_equal(Complex(1,1),Complex('3/3','3/3')) end - assert_raise(ArgumentError){Complex(nil)} - assert_raise(ArgumentError){Complex(Object.new)} + assert_raise(TypeError){Complex(nil)} + assert_raise(TypeError){Complex(Object.new)} assert_raise(ArgumentError){Complex()} assert_raise(ArgumentError){Complex(1,2,3)} diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 8cacab9a0..b43db9c98 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -124,9 +124,9 @@ class Rational_Test < Test::Unit::TestCase assert_equal(Rational(3),Rational('3')) assert_equal(Rational(1),Rational('3.0','3.0')) assert_equal(Rational(1),Rational('3/3','3/3')) - assert_raise(ArgumentError){Rational(nil)} + assert_raise(TypeError){Rational(nil)} assert_raise(ArgumentError){Rational('')} - assert_raise(ArgumentError){Rational(Object.new)} + assert_raise(TypeError){Rational(Object.new)} assert_raise(ArgumentError){Rational()} assert_raise(ArgumentError){Rational(1,2,3)} -- cgit