summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-13 16:38:56 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-13 16:38:56 +0000
commit1abdfa49b0ee4adf3e09f97f0c7a502ce3e4e9c4 (patch)
tree931700c9ec7630f4cbd2b6bf43a07761a899f101
parent39f3948bb2f1bf0bf00f7fc8870632309679ed67 (diff)
downloadruby-1abdfa49b0ee4adf3e09f97f0c7a502ce3e4e9c4.tar.gz
ruby-1abdfa49b0ee4adf3e09f97f0c7a502ce3e4e9c4.tar.xz
ruby-1abdfa49b0ee4adf3e09f97f0c7a502ce3e4e9c4.zip
* test/ruby/test_numeric.rb (TestNumeric::test_num2long): bit-and
should not raise RangeError. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--test/ruby/test_numeric.rb6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ddf4e4d3..2231b6e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ Thu Mar 13 10:42:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (zip_ary): wrong boundary condition.
+ * test/ruby/test_numeric.rb (TestNumeric::test_num2long): bit-and
+ should not raise RangeError.
+
Thu Mar 13 03:12:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb/cmd/help.rb: should be updated for new ri structure.
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index 468d89d55..8f478bd2c 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -211,10 +211,8 @@ class TestNumeric < Test::Unit::TestCase
def test_num2long
assert_raise(TypeError) { 1 & nil }
assert_equal(1, 1 & 1.0)
- assert_raise(RangeError) do
- 1 & 2147483648.0
- 1 & 9223372036854777856.0
- end
+ assert_equal(0, 1 & 2147483648.0)
+ assert_equal(0, 1 & 9223372036854777856.0)
o = Object.new
def o.to_int; 1; end
assert_equal(1, 1 & o)