Merge branch 'master' of github.com:mruby/mruby

4 files changed, 42 insertions, 1 deletions

diff --git a/test/assert.rb b/test/assert.rb
index 1e9a781d6..30d27d9ef 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -78,7 +78,7 @@ end
 def assert_true(ret, msg = nil, diff = nil)
   if $mrbtest_assert
     $mrbtest_assert_idx += 1
-    if !ret
+    unless ret
       msg = "Expected #{ret.inspect} to be true" unless msg
       diff = assertion_diff(true, ret)  unless diff
       $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
diff --git a/test/t/enumerable.rb b/test/t/enumerable.rb
index ed062823c..844251b06 100644
--- a/test/t/enumerable.rb
+++ b/test/t/enumerable.rb
@@ -8,11 +8,43 @@ end
 assert('Enumerable#all?', '15.3.2.2.1') do
   assert_true([1,2,3].all?)
   assert_false([1,false,3].all?)
+
+  a = [2,4,6]
+  all = a.all? do |e|
+    if e % 2 == 0
+      true
+    end
+  end
+  assert_true(all)
+
+  a = [2,4,7]
+  all = a.all? do |e|
+    if e % 2 == 0
+      true
+    end
+  end
+  assert_false(all)
 end
 
 assert('Enumerable#any?', '15.3.2.2.2') do
   assert_true([false,true,false].any?)
   assert_false([false,false,false].any?)
+
+  a = [1,3,6]
+  any = a.any? do |e|
+    if e % 2 == 0
+      true
+    end
+  end
+  assert_true(any)
+
+  a = [1,3,5]
+  any = a.any? do |e|
+    if e % 2 == 0
+      true
+    end
+  end
+  assert_false(any)
 end
 
 assert('Enumerable#collect', '15.3.2.2.3') do
diff --git a/test/t/float.rb b/test/t/float.rb
index b50b1e175..c817e01da 100644
--- a/test/t/float.rb
+++ b/test/t/float.rb
@@ -15,6 +15,9 @@ assert('Float#+', '15.2.9.3.1') do
 
   assert_float(3.123456789, a)
   assert_float(4.123456789, b)
+
+  assert_raise(TypeError){ 0.0+nil }
+  assert_raise(TypeError){ 1.0+nil }
 end
 
 assert('Float#-', '15.2.9.3.2') do
diff --git a/test/t/integer.rb b/test/t/integer.rb
index 2bffce5a9..66dd61c0b 100644
--- a/test/t/integer.rb
+++ b/test/t/integer.rb
@@ -15,6 +15,9 @@ assert('Integer#+', '15.2.8.3.1') do
 
   assert_equal 2, a
   assert_equal 2.0, b
+
+  assert_raise(TypeError){ 0+nil }
+  assert_raise(TypeError){ 1+nil }
 end
 
 assert('Integer#-', '15.2.8.3.2') do
@@ -31,6 +34,9 @@ assert('Integer#*', '15.2.8.3.3') do
 
   assert_equal 1, a
   assert_equal 1.0, b
+
+  assert_raise(TypeError){ 0*nil }
+  assert_raise(TypeError){ 1*nil }
 end
 
 assert('Integer#/', '15.2.8.3.4') do