1 files changed, 22 insertions, 20 deletions
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index ab492743f6..b272b89921 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -18,18 +18,24 @@ class TestNumeric < Test::Unit::TestCase
     assert_raise_with_message(TypeError, /can't be coerced into /) {1|:foo}
     assert_raise_with_message(TypeError, /can't be coerced into /) {1^:foo}
 
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1+:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1&:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1|:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3042}/) {1^:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1+:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1&:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1+"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1&"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1|"\u{3044}".to_sym}
-    assert_raise_with_message(TypeError, /:\u{3044}/) {1^"\u{3044}".to_sym}
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1+:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1&:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1|:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:\u{3042}/) {1^:"\u{3042}"}
+
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1+"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1&"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1|"\u{3044}".to_sym}
+      assert_raise_with_message(TypeError, /:\u{3044}/) {1^"\u{3044}".to_sym}
+    end
+
+    EnvUtil.with_default_internal(Encoding::US_ASCII) do
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1+:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1&:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
+      assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
+    end
 
     bug10711 = '[ruby-core:67405] [Bug #10711]'
     exp = "1.2 can't be coerced into Integer"
@@ -200,14 +206,6 @@ class TestNumeric < Test::Unit::TestCase
     assert_nil(a <=> :foo)
   end
 
-  def test_float_round_ndigits
-    bug14635 = "[ruby-core:86323]"
-    f = 0.5
-    31.times do |i|
-      assert_equal(0.5, f.round(i+1), bug14635 + " (argument: #{i+1})")
-    end
-  end
-
   def test_floor_ceil_round_truncate
     a = Class.new(Numeric) do
       def to_f; 1.5; end
@@ -483,6 +481,10 @@ class TestNumeric < Test::Unit::TestCase
     assert_equal(0,  0.pow(3, 1))
     assert_equal(0,  2.pow(3, 1))
     assert_equal(0, -2.pow(3, 1))
+
+    min, max = RbConfig::LIMITS.values_at("FIXNUM_MIN", "FIXNUM_MAX")
+    assert_equal(0, 0.pow(2, min))
+    assert_equal(0, Integer.sqrt(max+1).pow(2, min))
   end
 
 end