Merge branch 'master' into i110/inspect-recursion

1 files changed, 6 insertions, 2 deletions

diff --git a/mrbgems/mruby-kernel-ext/test/kernel.rb b/mrbgems/mruby-kernel-ext/test/kernel.rb
index 206b7ac74..ad9177165 100644
--- a/mrbgems/mruby-kernel-ext/test/kernel.rb
+++ b/mrbgems/mruby-kernel-ext/test/kernel.rb
@@ -49,21 +49,25 @@ assert('Kernel#__method__') do
 end
 
 assert('Kernel#Integer') do
-  assert_equal(123, Integer(123.999)) if class_defined?("Float")
   assert_equal(26, Integer("0x1a"))
   assert_equal(930, Integer("0930", 10))
   assert_equal(7, Integer("111", 2))
   assert_equal(0, Integer("0"))
   assert_equal(0, Integer("00000"))
   assert_raise(TypeError) { Integer(nil) }
+  skip unless Object.const_defined?(:Float)
+  assert_equal(123, Integer(123.999))
 end
 
 assert('Kernel#Float') do
+  skip unless Object.const_defined?(:Float)
   assert_equal(1.0, Float(1))
   assert_equal(123.456, Float(123.456))
   assert_equal(123.456, Float("123.456"))
   assert_raise(TypeError) { Float(nil) }
-end if class_defined?("Float")
+  assert_raise(ArgumentError) { Float("1.5a") }
+  assert_raise(ArgumentError) { Float("1.5\0") }
+end
 
 assert('Kernel#String') do
   assert_equal("main", String(self))