From 31d1992958cf1d7fe8b345ef9121f176026d3cf3 Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 7 Sep 2008 15:59:12 +0000 Subject: * rational.c: removed unused code. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_complex.rb | 20 ++++++++++++++++---- test/ruby/test_rational.rb | 36 +++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb index 207422ff0..ef612e227 100644 --- a/test/ruby/test_complex.rb +++ b/test/ruby/test_complex.rb @@ -631,9 +631,6 @@ class Complex_Test < Test::Unit::TestCase end def test_parse - assert_equal(Complex(0), ''.to_c) - assert_equal(Complex(0), ' '.to_c) - assert_equal(Complex(5), "\f\n\r\t\v5\0".to_c) assert_equal(Complex(5), '5'.to_c) assert_equal(Complex(-5), '-5'.to_c) assert_equal(Complex(5,3), '5+3i'.to_c) @@ -674,6 +671,12 @@ class Complex_Test < Test::Unit::TestCase assert_equal(Complex(0.0,3.0), '3e0i'.to_c) assert_equal(Complex(0.0,-3.0), '-3e0i'.to_c) + assert_equal(Complex(0.33), '.33'.to_c) + assert_equal(Complex(0.33), '0.33'.to_c) + assert_equal(Complex(-0.33), '-.33'.to_c) + assert_equal(Complex(-0.33), '-0.33'.to_c) + assert_equal(Complex(-0.33), '-0.3_3'.to_c) + assert_equal(Complex.polar(10,10), '10@10'.to_c) assert_equal(Complex.polar(-10,-10), '-10@-10'.to_c) assert_equal(Complex.polar(10.5,10.5), '10.5@10.5'.to_c) @@ -719,11 +722,20 @@ class Complex_Test < Test::Unit::TestCase assert_equal(Complex(0.0,3.0), Complex('3e0i')) assert_equal(Complex(0.0,-3.0), Complex('-3e0i')) + assert_equal(Complex(0.33), Complex('.33')) + assert_equal(Complex(0.33), Complex('0.33')) + assert_equal(Complex(-0.33), Complex('-.33')) + assert_equal(Complex(-0.33), Complex('-0.33')) + assert_equal(Complex(-0.33), Complex('-0.3_3')) + assert_equal(Complex.polar(10,10), Complex('10@10')) assert_equal(Complex.polar(-10,-10), Complex('-10@-10')) assert_equal(Complex.polar(10.5,10.5), Complex('10.5@10.5')) assert_equal(Complex.polar(-10.5,-10.5), Complex('-10.5@-10.5')) + assert_equal(Complex(0), ''.to_c) + assert_equal(Complex(0), ' '.to_c) + assert_equal(Complex(5), "\f\n\r\t\v5\0".to_c) assert_equal(Complex(0), '_'.to_c) assert_equal(Complex(0), '_5'.to_c) assert_equal(Complex(5), '5_'.to_c) @@ -734,6 +746,7 @@ class Complex_Test < Test::Unit::TestCase assert_equal(Complex(5,3), '5+3ix'.to_c) assert_raise(ArgumentError){ Complex('')} assert_raise(ArgumentError){ Complex('_')} + assert_raise(ArgumentError){ Complex("\f\n\r\t\v5\0")} assert_raise(ArgumentError){ Complex('_5')} assert_raise(ArgumentError){ Complex('5_')} assert_raise(ArgumentError){ Complex('5x')} @@ -741,7 +754,6 @@ class Complex_Test < Test::Unit::TestCase assert_raise(ArgumentError){ Complex('5+3_i')} assert_raise(ArgumentError){ Complex('5+3i_')} assert_raise(ArgumentError){ Complex('5+3ix')} - assert_raise(ArgumentError){ Complex("5\0")} if defined?(Rational) && defined?(''.to_r) assert_equal(Complex(Rational(1,5)), '1/5'.to_c) diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 300215526..71763242d 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -866,9 +866,6 @@ class Rational_Test < Test::Unit::TestCase end def test_parse - assert_equal(Rational(0), ''.to_r) - assert_equal(Rational(0), ' '.to_r) - assert_equal(Rational(5), "\f\n\r\t\v5\0".to_r) assert_equal(Rational(5), '5'.to_r) assert_equal(Rational(-5), '-5'.to_r) assert_equal(Rational(5,3), '5/3'.to_r) @@ -890,7 +887,9 @@ class Rational_Test < Test::Unit::TestCase # assert_equal(Rational(5,-3), '5e0/-3'.to_r) # assert_equal(Rational(-5,-3), '-5e0/-3'.to_r) + assert_equal(Rational(33,100), '.33'.to_r) assert_equal(Rational(33,100), '0.33'.to_r) + assert_equal(Rational(-33,100), '-.33'.to_r) assert_equal(Rational(-33,100), '-0.33'.to_r) assert_equal(Rational(-33,100), '-0.3_3'.to_r) @@ -911,24 +910,39 @@ class Rational_Test < Test::Unit::TestCase # assert_equal(Rational(5,-3), Rational('5/-3')) # assert_equal(Rational(-5,-3), Rational('-5/-3')) + assert_equal(Rational(5), Rational('5.0')) + assert_equal(Rational(-5), Rational('-5.0')) + assert_equal(Rational(5,3), Rational('5.0/3')) + assert_equal(Rational(-5,3), Rational('-5.0/3')) +# assert_equal(Rational(5,-3), Rational('5.0/-3')) +# assert_equal(Rational(-5,-3), Rational('-5.0/-3')) + + assert_equal(Rational(5), Rational('5e0')) + assert_equal(Rational(-5), Rational('-5e0')) + assert_equal(Rational(5,3), Rational('5e0/3')) + assert_equal(Rational(-5,3), Rational('-5e0/3')) +# assert_equal(Rational(5,-3), Rational('5e0/-3')) +# assert_equal(Rational(-5,-3), Rational('-5e0/-3')) + + assert_equal(Rational(33,100), Rational('.33')) assert_equal(Rational(33,100), Rational('0.33')) + assert_equal(Rational(-33,100), Rational('-.33')) assert_equal(Rational(-33,100), Rational('-0.33')) assert_equal(Rational(-33,100), Rational('-0.3_3')) assert_equal(Rational(1,2), Rational('5e-1')) + assert_equal(Rational(50), Rational('5e+1')) + assert_equal(Rational(1,2), Rational('5.0e-1')) + assert_equal(Rational(50), Rational('5.0e+1')) assert_equal(Rational(50), Rational('5e1')) assert_equal(Rational(50), Rational('5E1')) assert_equal(Rational(500), Rational('5e2')) assert_equal(Rational(5000), Rational('5e3')) assert_equal(Rational(500000000000), Rational('5e1_1')) - assert_equal(Rational(5.0), Rational('5.0')) - assert_equal(Rational(-5.0), Rational('-5.0')) - assert_equal(Rational(5.0,3), Rational('5.0/3')) - assert_equal(Rational(-5.0,3), Rational('-5.0/3')) -# assert_equal(Rational(5.0,-3), Rational('5.0/-3')) -# assert_equal(Rational(-5.0,-3), Rational('-5.0/-3')) - + assert_equal(Rational(0), ''.to_r) + assert_equal(Rational(0), ' '.to_r) + assert_equal(Rational(5), "\f\n\r\t\v5\0".to_r) assert_equal(Rational(0), '_'.to_r) assert_equal(Rational(0), '_5'.to_r) assert_equal(Rational(5), '5_'.to_r) @@ -939,6 +953,7 @@ class Rational_Test < Test::Unit::TestCase assert_equal(Rational(5,3), '5/3x'.to_r) assert_raise(ArgumentError){ Rational('')} assert_raise(ArgumentError){ Rational('_')} + assert_raise(ArgumentError){ Rational("\f\n\r\t\v5\0")} assert_raise(ArgumentError){ Rational('_5')} assert_raise(ArgumentError){ Rational('5_')} assert_raise(ArgumentError){ Rational('5x')} @@ -946,7 +961,6 @@ class Rational_Test < Test::Unit::TestCase assert_raise(ArgumentError){ Rational('5/3_')} assert_raise(ArgumentError){ Rational('5/3.3')} assert_raise(ArgumentError){ Rational('5/3x')} - assert_raise(ArgumentError){ Rational("5\0")} end =begin -- cgit