github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

just check Integer 

* test/ruby/test_bignum.rb (test_pow): just assert to be an
  Integer.

* test/ruby/test_integer_comb.rb (check_class): ditto.

* test/ruby/test_numeric.rb (test_coerce): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-05-21 18:09:05 +00:00
Родитель a7955b31c0
Коммит 45e3b48be5
3 изменённых файлов: 27 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
test/ruby/test_bignum.rb
Просмотреть файл

@ -469,7 +469,7 @@ class TestBignum < Test::Unit::TestCase
assert_raise(TypeError, ArgumentError) { T32**"foo" } assert_raise(TypeError, ArgumentError) { T32**"foo" }
feature3429 = '[ruby-core:30735]' feature3429 = '[ruby-core:30735]'
assert_bignum((2 ** 7830457), feature3429) assert_kind_of(Integer, (2 ** 7830457), feature3429)
end end
def test_and def test_and

56
test/ruby/test_integer_comb.rb
Просмотреть файл

@ -120,14 +120,6 @@ class TestIntegerComb < Test::Unit::TestCase
assert_bignum(FIXNUM_MAX+1) assert_bignum(FIXNUM_MAX+1)
end end
def check_class(n)
if FIXNUM_MIN <= n && n <= FIXNUM_MAX
assert_fixnum(n)
else
assert_bignum(n)
end
end
def test_aref def test_aref
VS.each {|a| VS.each {|a|
100.times {|i| 100.times {|i|
@ -138,7 +130,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|b| VS.each {|b|
c = nil c = nil
assert_nothing_raised("(#{a})[#{b}]") { c = a[b] } assert_nothing_raised("(#{a})[#{b}]") { c = a[b] }
check_class(c) assert_kind_of(Integer, c)
if b < 0 if b < 0
assert_equal(0, c, "(#{a})[#{b}]") assert_equal(0, c, "(#{a})[#{b}]")
else else
@ -152,7 +144,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a + b c = a + b
check_class(c) assert_kind_of(Integer, c)
assert_equal(b + a, c, "#{a} + #{b}") assert_equal(b + a, c, "#{a} + #{b}")
assert_equal(a, c - b, "(#{a} + #{b}) - #{b}") assert_equal(a, c - b, "(#{a} + #{b}) - #{b}")
assert_equal(a-~b-1, c, "#{a} + #{b}") # Hacker's Delight assert_equal(a-~b-1, c, "#{a} + #{b}") # Hacker's Delight
@ -167,7 +159,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a - b c = a - b
check_class(c) assert_kind_of(Integer, c)
assert_equal(a, c + b, "(#{a} - #{b}) + #{b}") assert_equal(a, c + b, "(#{a} - #{b}) + #{b}")
assert_equal(-b, c - a, "(#{a} - #{b}) - #{a}") assert_equal(-b, c - a, "(#{a} - #{b}) - #{a}")
assert_equal(a+~b+1, c, "#{a} - #{b}") # Hacker's Delight assert_equal(a+~b+1, c, "#{a} - #{b}") # Hacker's Delight
@ -182,7 +174,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a * b c = a * b
check_class(c) assert_kind_of(Integer, c)
assert_equal(b * a, c, "#{a} * #{b}") assert_equal(b * a, c, "#{a} * #{b}")
assert_equal(b.send(:*, a), c, "#{a} * #{b}") assert_equal(b.send(:*, a), c, "#{a} * #{b}")
assert_equal(b, c / a, "(#{a} * #{b}) / #{a}") if a != 0 assert_equal(b, c / a, "(#{a} * #{b}) / #{a}") if a != 0
@ -200,8 +192,8 @@ class TestIntegerComb < Test::Unit::TestCase
assert_raise(ZeroDivisionError) { a.divmod(b) } assert_raise(ZeroDivisionError) { a.divmod(b) }
else else
q, r = a.divmod(b) q, r = a.divmod(b)
check_class(q) assert_kind_of(Integer, q)
check_class(r) assert_kind_of(Integer, r)
assert_equal(a, b*q+r) assert_equal(a, b*q+r)
assert_operator(r.abs, :<, b.abs) assert_operator(r.abs, :<, b.abs)
if 0 < b if 0 < b
@ -225,7 +217,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
small_values.each {|b| small_values.each {|b|
c = a ** b c = a ** b
check_class(c) assert_kind_of(Integer, c)
d = 1 d = 1
b.times { d *= a } b.times { d *= a }
assert_equal(d, c, "(#{a}) ** #{b}") assert_equal(d, c, "(#{a}) ** #{b}")
@ -241,7 +233,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_not def test_not
VS.each {|a| VS.each {|a|
b = ~a b = ~a
check_class(b) assert_kind_of(Integer, b)
assert_equal(-1 ^ a, b, "~#{a}") assert_equal(-1 ^ a, b, "~#{a}")
assert_equal(-a-1, b, "~#{a}") # Hacker's Delight assert_equal(-a-1, b, "~#{a}") # Hacker's Delight
assert_equal(0, a & b, "#{a} & ~#{a}") assert_equal(0, a & b, "#{a} & ~#{a}")
@ -253,7 +245,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a | b c = a | b
check_class(c) assert_kind_of(Integer, c)
assert_equal(b | a, c, "#{a} | #{b}") assert_equal(b | a, c, "#{a} | #{b}")
assert_equal(a + b - (a&b), c, "#{a} | #{b}") assert_equal(a + b - (a&b), c, "#{a} | #{b}")
assert_equal((a & ~b) + b, c, "#{a} | #{b}") # Hacker's Delight assert_equal((a & ~b) + b, c, "#{a} | #{b}") # Hacker's Delight
@ -266,7 +258,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a & b c = a & b
check_class(c) assert_kind_of(Integer, c)
assert_equal(b & a, c, "#{a} & #{b}") assert_equal(b & a, c, "#{a} & #{b}")
assert_equal(a + b - (a|b), c, "#{a} & #{b}") assert_equal(a + b - (a|b), c, "#{a} & #{b}")
assert_equal((~a | b) - ~a, c, "#{a} & #{b}") # Hacker's Delight assert_equal((~a | b) - ~a, c, "#{a} & #{b}") # Hacker's Delight
@ -279,7 +271,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
VS.each {|b| VS.each {|b|
c = a ^ b c = a ^ b
check_class(c) assert_kind_of(Integer, c)
assert_equal(b ^ a, c, "#{a} ^ #{b}") assert_equal(b ^ a, c, "#{a} ^ #{b}")
assert_equal((a|b)-(a&b), c, "#{a} ^ #{b}") # Hacker's Delight assert_equal((a|b)-(a&b), c, "#{a} ^ #{b}") # Hacker's Delight
assert_equal(b, c ^ a, "(#{a} ^ #{b}) ^ #{a}") assert_equal(b, c ^ a, "(#{a} ^ #{b}) ^ #{a}")
@ -292,7 +284,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
small_values.each {|b| small_values.each {|b|
c = a << b c = a << b
check_class(c) assert_kind_of(Integer, c)
if 0 <= b if 0 <= b
assert_equal(a, c >> b, "(#{a} << #{b}) >> #{b}") assert_equal(a, c >> b, "(#{a} << #{b}) >> #{b}")
assert_equal(a * 2**b, c, "#{a} << #{b}") assert_equal(a * 2**b, c, "#{a} << #{b}")
@ -309,7 +301,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a| VS.each {|a|
small_values.each {|b| small_values.each {|b|
c = a >> b c = a >> b
check_class(c) assert_kind_of(Integer, c)
if b <= 0 if b <= 0
assert_equal(a, c << b, "(#{a} >> #{b}) << #{b}") assert_equal(a, c << b, "(#{a} >> #{b}) << #{b}")
assert_equal(a * 2**(-b), c, "#{a} >> #{b}") assert_equal(a * 2**(-b), c, "#{a} >> #{b}")
@ -324,7 +316,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_succ def test_succ
VS.each {|a| VS.each {|a|
b = a.succ b = a.succ
check_class(b) assert_kind_of(Integer, b)
assert_equal(a+1, b, "(#{a}).succ") assert_equal(a+1, b, "(#{a}).succ")
assert_equal(a, b.pred, "(#{a}).succ.pred") assert_equal(a, b.pred, "(#{a}).succ.pred")
assert_equal(a, b-1, "(#{a}).succ - 1") assert_equal(a, b-1, "(#{a}).succ - 1")
@ -334,7 +326,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_pred def test_pred
VS.each {|a| VS.each {|a|
b = a.pred b = a.pred
check_class(b) assert_kind_of(Integer, b)
assert_equal(a-1, b, "(#{a}).pred") assert_equal(a-1, b, "(#{a}).pred")
assert_equal(a, b.succ, "(#{a}).pred.succ") assert_equal(a, b.succ, "(#{a}).pred.succ")
assert_equal(a, b + 1, "(#{a}).pred + 1") assert_equal(a, b + 1, "(#{a}).pred + 1")
@ -344,7 +336,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_unary_plus def test_unary_plus
VS.each {|a| VS.each {|a|
b = +a b = +a
check_class(b) assert_kind_of(Integer, b)
assert_equal(a, b, "+(#{a})") assert_equal(a, b, "+(#{a})")
} }
end end
@ -352,7 +344,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_unary_minus def test_unary_minus
VS.each {|a| VS.each {|a|
b = -a b = -a
check_class(b) assert_kind_of(Integer, b)
assert_equal(0-a, b, "-(#{a})") assert_equal(0-a, b, "-(#{a})")
assert_equal(~a+1, b, "-(#{a})") assert_equal(~a+1, b, "-(#{a})")
assert_equal(0, a+b, "#{a}+(-(#{a}))") assert_equal(0, a+b, "#{a}+(-(#{a}))")
@ -384,7 +376,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_abs def test_abs
VS.each {|a| VS.each {|a|
b = a.abs b = a.abs
check_class(b) assert_kind_of(Integer, b)
if a < 0 if a < 0
assert_equal(-a, b, "(#{a}).abs") assert_equal(-a, b, "(#{a}).abs")
else else
@ -396,7 +388,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_ceil def test_ceil
VS.each {|a| VS.each {|a|
b = a.ceil b = a.ceil
check_class(b) assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).ceil") assert_equal(a, b, "(#{a}).ceil")
} }
end end
@ -404,7 +396,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_floor def test_floor
VS.each {|a| VS.each {|a|
b = a.floor b = a.floor
check_class(b) assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).floor") assert_equal(a, b, "(#{a}).floor")
} }
end end
@ -412,7 +404,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_round def test_round
VS.each {|a| VS.each {|a|
b = a.round b = a.round
check_class(b) assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).round") assert_equal(a, b, "(#{a}).round")
} }
end end
@ -420,7 +412,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_truncate def test_truncate
VS.each {|a| VS.each {|a|
b = a.truncate b = a.truncate
check_class(b) assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).truncate") assert_equal(a, b, "(#{a}).truncate")
} }
end end
@ -432,7 +424,7 @@ class TestIntegerComb < Test::Unit::TestCase
assert_raise(ZeroDivisionError) { a.divmod(b) } assert_raise(ZeroDivisionError) { a.divmod(b) }
else else
r = a.remainder(b) r = a.remainder(b)
check_class(r) assert_kind_of(Integer, r)
if a < 0 if a < 0
assert_operator(-b.abs, :<, r, "#{a}.remainder(#{b})") assert_operator(-b.abs, :<, r, "#{a}.remainder(#{b})")
assert_operator(0, :>=, r, "#{a}.remainder(#{b})") assert_operator(0, :>=, r, "#{a}.remainder(#{b})")
@ -457,7 +449,7 @@ class TestIntegerComb < Test::Unit::TestCase
else else
assert_equal(false, z, "(#{a}).zero?") assert_equal(false, z, "(#{a}).zero?")
assert_equal(a, n, "(#{a}).nonzero?") assert_equal(a, n, "(#{a}).nonzero?")
check_class(n) assert_kind_of(Integer, n)
end end
assert(z ^ n, "(#{a}).zero? ^ (#{a}).nonzero?") assert(z ^ n, "(#{a}).zero? ^ (#{a}).nonzero?")
} }

4
test/ruby/test_numeric.rb
Просмотреть файл

@ -4,8 +4,8 @@ require 'test/unit'
class TestNumeric < Test::Unit::TestCase class TestNumeric < Test::Unit::TestCase
def test_coerce def test_coerce
a, b = 1.coerce(2) a, b = 1.coerce(2)
assert_fixnum(a) assert_kind_of(Integer, a)
assert_fixnum(b) assert_kind_of(Integer, b)
a, b = 1.coerce(2.0) a, b = 1.coerce(2.0)
assert_equal(Float, a.class) assert_equal(Float, a.class)