summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-21 18:09:05 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-21 18:09:05 (GMT)
commit45e3b48be5fe1faf46f8b0925b00d6cd8f2aa6e6 (patch)
treec1b67ef2de1998c97e7a2ca03f05031a330105de /test
parenta7955b31c04a2a66ad1ac270b7dd8a85ea48f52a (diff)
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
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_bignum.rb2
-rw-r--r--test/ruby/test_integer_comb.rb56
-rw-r--r--test/ruby/test_numeric.rb4
3 files changed, 27 insertions, 35 deletions
diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb
index d2d15f6..7760062 100644
--- a/test/ruby/test_bignum.rb
+++ b/test/ruby/test_bignum.rb
@@ -469,7 +469,7 @@ class TestBignum < Test::Unit::TestCase
assert_raise(TypeError, ArgumentError) { T32**"foo" }
feature3429 = '[ruby-core:30735]'
- assert_bignum((2 ** 7830457), feature3429)
+ assert_kind_of(Integer, (2 ** 7830457), feature3429)
end
def test_and
diff --git a/test/ruby/test_integer_comb.rb b/test/ruby/test_integer_comb.rb
index 8c5cba2..7e21279 100644
--- a/test/ruby/test_integer_comb.rb
+++ b/test/ruby/test_integer_comb.rb
@@ -120,14 +120,6 @@ class TestIntegerComb < Test::Unit::TestCase
assert_bignum(FIXNUM_MAX+1)
end
- def check_class(n)
- if FIXNUM_MIN <= n && n <= FIXNUM_MAX
- assert_fixnum(n)
- else
- assert_bignum(n)
- end
- end
-
def test_aref
VS.each {|a|
100.times {|i|
@@ -138,7 +130,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|b|
c = nil
assert_nothing_raised("(#{a})[#{b}]") { c = a[b] }
- check_class(c)
+ assert_kind_of(Integer, c)
if b < 0
assert_equal(0, c, "(#{a})[#{b}]")
else
@@ -152,7 +144,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a|
VS.each {|b|
c = a + b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(b + a, c, "#{a} + #{b}")
assert_equal(a, c - b, "(#{a} + #{b}) - #{b}")
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 {|b|
c = a - b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(a, c + b, "(#{a} - #{b}) + #{b}")
assert_equal(-b, c - a, "(#{a} - #{b}) - #{a}")
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 {|b|
c = a * b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(b * a, c, "#{a} * #{b}")
assert_equal(b.send(:*, a), c, "#{a} * #{b}")
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) }
else
q, r = a.divmod(b)
- check_class(q)
- check_class(r)
+ assert_kind_of(Integer, q)
+ assert_kind_of(Integer, r)
assert_equal(a, b*q+r)
assert_operator(r.abs, :<, b.abs)
if 0 < b
@@ -225,7 +217,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a|
small_values.each {|b|
c = a ** b
- check_class(c)
+ assert_kind_of(Integer, c)
d = 1
b.times { d *= a }
assert_equal(d, c, "(#{a}) ** #{b}")
@@ -241,7 +233,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_not
VS.each {|a|
b = ~a
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(-1 ^ a, b, "~#{a}")
assert_equal(-a-1, b, "~#{a}") # Hacker's Delight
assert_equal(0, a & b, "#{a} & ~#{a}")
@@ -253,7 +245,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a|
VS.each {|b|
c = a | b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(b | a, c, "#{a} | #{b}")
assert_equal(a + b - (a&b), c, "#{a} | #{b}")
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 {|b|
c = a & b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(b & a, c, "#{a} & #{b}")
assert_equal(a + b - (a|b), c, "#{a} & #{b}")
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 {|b|
c = a ^ b
- check_class(c)
+ assert_kind_of(Integer, c)
assert_equal(b ^ a, c, "#{a} ^ #{b}")
assert_equal((a|b)-(a&b), c, "#{a} ^ #{b}") # Hacker's Delight
assert_equal(b, c ^ a, "(#{a} ^ #{b}) ^ #{a}")
@@ -292,7 +284,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a|
small_values.each {|b|
c = a << b
- check_class(c)
+ assert_kind_of(Integer, c)
if 0 <= b
assert_equal(a, c >> b, "(#{a} << #{b}) >> #{b}")
assert_equal(a * 2**b, c, "#{a} << #{b}")
@@ -309,7 +301,7 @@ class TestIntegerComb < Test::Unit::TestCase
VS.each {|a|
small_values.each {|b|
c = a >> b
- check_class(c)
+ assert_kind_of(Integer, c)
if b <= 0
assert_equal(a, c << b, "(#{a} >> #{b}) << #{b}")
assert_equal(a * 2**(-b), c, "#{a} >> #{b}")
@@ -324,7 +316,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_succ
VS.each {|a|
b = a.succ
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a+1, b, "(#{a}).succ")
assert_equal(a, b.pred, "(#{a}).succ.pred")
assert_equal(a, b-1, "(#{a}).succ - 1")
@@ -334,7 +326,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_pred
VS.each {|a|
b = a.pred
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a-1, b, "(#{a}).pred")
assert_equal(a, b.succ, "(#{a}).pred.succ")
assert_equal(a, b + 1, "(#{a}).pred + 1")
@@ -344,7 +336,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_unary_plus
VS.each {|a|
b = +a
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a, b, "+(#{a})")
}
end
@@ -352,7 +344,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_unary_minus
VS.each {|a|
b = -a
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(0-a, b, "-(#{a})")
assert_equal(~a+1, b, "-(#{a})")
assert_equal(0, a+b, "#{a}+(-(#{a}))")
@@ -384,7 +376,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_abs
VS.each {|a|
b = a.abs
- check_class(b)
+ assert_kind_of(Integer, b)
if a < 0
assert_equal(-a, b, "(#{a}).abs")
else
@@ -396,7 +388,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_ceil
VS.each {|a|
b = a.ceil
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).ceil")
}
end
@@ -404,7 +396,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_floor
VS.each {|a|
b = a.floor
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).floor")
}
end
@@ -412,7 +404,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_round
VS.each {|a|
b = a.round
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).round")
}
end
@@ -420,7 +412,7 @@ class TestIntegerComb < Test::Unit::TestCase
def test_truncate
VS.each {|a|
b = a.truncate
- check_class(b)
+ assert_kind_of(Integer, b)
assert_equal(a, b, "(#{a}).truncate")
}
end
@@ -432,7 +424,7 @@ class TestIntegerComb < Test::Unit::TestCase
assert_raise(ZeroDivisionError) { a.divmod(b) }
else
r = a.remainder(b)
- check_class(r)
+ assert_kind_of(Integer, r)
if a < 0
assert_operator(-b.abs, :<, r, "#{a}.remainder(#{b})")
assert_operator(0, :>=, r, "#{a}.remainder(#{b})")
@@ -457,7 +449,7 @@ class TestIntegerComb < Test::Unit::TestCase
else
assert_equal(false, z, "(#{a}).zero?")
assert_equal(a, n, "(#{a}).nonzero?")
- check_class(n)
+ assert_kind_of(Integer, n)
end
assert(z ^ n, "(#{a}).zero? ^ (#{a}).nonzero?")
}
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index 51d266f..c5817c5 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -4,8 +4,8 @@ require 'test/unit'
class TestNumeric < Test::Unit::TestCase
def test_coerce
a, b = 1.coerce(2)
- assert_fixnum(a)
- assert_fixnum(b)
+ assert_kind_of(Integer, a)
+ assert_kind_of(Integer, b)
a, b = 1.coerce(2.0)
assert_equal(Float, a.class)