1 files changed, 31 insertions, 61 deletions
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index 81ac432979..c5b9c15ba9 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -280,37 +280,23 @@ class TestKeywordArguments < Test::Unit::TestCase
     f = -> { true }
     assert_equal(true, f[**{}])
     assert_equal(true, f[**kw])
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { f[**h] }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { f[a: 1] }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { f[**h2] }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { f[**h3] }
-    end
+    assert_raise(ArgumentError) { f[**h] }
+    assert_raise(ArgumentError) { f[a: 1] }
+    assert_raise(ArgumentError) { f[**h2] }
+    assert_raise(ArgumentError) { f[**h3] }
 
     f = ->(a) { a }
-    assert_raise(ArgumentError) { f[**{}] }
-    assert_raise(ArgumentError) { f[**kw] }
     assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h, f[**h])
+      assert_equal(kw, f[**{}])
     end
     assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h, f[a: 1])
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h2, f[**h2])
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h3, f[**h3])
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h3, f[a: 1, **h2])
+      assert_equal(kw, f[**kw])
     end
+    assert_equal(h, f[**h])
+    assert_equal(h, f[a: 1])
+    assert_equal(h2, f[**h2])
+    assert_equal(h3, f[**h3])
+    assert_equal(h3, f[a: 1, **h2])
 
     f = ->(**x) { x }
     assert_equal(kw, f[**{}])
@@ -800,43 +786,27 @@ class TestKeywordArguments < Test::Unit::TestCase
     end
     assert_nil(c.m(**{}))
     assert_nil(c.m(**kw))
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { c.m(**h) }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { c.m(a: 1) }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { c.m(**h2) }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { c.m(**h3) }
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_raise(ArgumentError) { c.m(a: 1, **h2) }
-    end
+    assert_raise(ArgumentError) { c.m(**h) }
+    assert_raise(ArgumentError) { c.m(a: 1) }
+    assert_raise(ArgumentError) { c.m(**h2) }
+    assert_raise(ArgumentError) { c.m(**h3) }
+    assert_raise(ArgumentError) { c.m(a: 1, **h2) }
 
     c = Object.new
     class << c
       define_method(:m) {|arg| arg }
     end
-    assert_raise(ArgumentError) { c.m(**{}) }
-    assert_raise(ArgumentError) { c.m(**kw) }
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h, c.m(**h))
-    end
     assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h, c.m(a: 1))
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h2, c.m(**h2))
-    end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h3, c.m(**h3))
+      assert_equal(kw, c.m(**{}))
     end
     assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal(h3, c.m(a: 1, **h2))
+      assert_equal(kw, c.m(**kw))
     end
+    assert_equal(h, c.m(**h))
+    assert_equal(h, c.m(a: 1))
+    assert_equal(h2, c.m(**h2))
+    assert_equal(h3, c.m(**h3))
+    assert_equal(h3, c.m(a: 1, **h2))
 
     c = Object.new
     class << c
@@ -866,8 +836,12 @@ class TestKeywordArguments < Test::Unit::TestCase
     class << c
       define_method(:m) {|arg, **opt| [arg, opt] }
     end
-    assert_raise(ArgumentError) { c.m(**{}) }
-    assert_raise(ArgumentError) { c.m(**kw) }
+    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
+      assert_equal([kw, kw], c.m(**{}))
+    end
+    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
+      assert_equal([kw, kw], c.m(**kw))
+    end
     assert_warn(/The keyword argument is passed as the last hash parameter/m) do
       assert_equal([h, kw], c.m(**h))
     end
@@ -1347,14 +1321,10 @@ class TestKeywordArguments < Test::Unit::TestCase
 
     o = Object.new
     def o.to_hash() { a: 1 } end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal({a: 1}, m1(**o) {|x| break x}, bug9898)
-    end
+    assert_equal({a: 1}, m1(**o) {|x| break x}, bug9898)
     o2 = Object.new
     def o2.to_hash() { b: 2 } end
-    assert_warn(/The keyword argument is passed as the last hash parameter/m) do
-      assert_equal({a: 1, b: 2}, m1(**o, **o2) {|x| break x}, bug9898)
-    end
+    assert_equal({a: 1, b: 2}, m1(**o, **o2) {|x| break x}, bug9898)
   end
 
   def test_implicit_hash_conversion