test_keyword.rb: check error messages

* test/ruby/test_keyword.rb (test_required_keyword): check also
  error messages.

* test/ruby/test_keyword.rb (test_block_required_keyword): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 6 deletions

diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index dd4f6d1b42..a63ff8233f 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -305,15 +305,16 @@ class TestKeywordArguments < Test::Unit::TestCase
       eval("def o.foo(a:) a; end")
       eval("def o.bar(a:,**b) [a, b]; end")
     end
-    assert_raise(ArgumentError, feature7701) {o.foo}
+    assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {o.foo}
     assert_equal(42, o.foo(a: 42), feature7701)
     assert_equal([[:keyreq, :a]], o.method(:foo).parameters, feature7701)
 
     bug8139 = '[ruby-core:53608] [Bug #8139] required keyword argument with rest hash'
     assert_equal([42, {}], o.bar(a: 42), feature7701)
+    assert_equal([42, {c: feature7701}], o.bar(a: 42, c: feature7701), feature7701)
     assert_equal([[:keyreq, :a], [:keyrest, :b]], o.method(:bar).parameters, feature7701)
-    assert_raise(ArgumentError, bug8139) {o.bar(c: bug8139)}
-    assert_raise(ArgumentError, bug8139) {o.bar}
+    assert_raise_with_message(ArgumentError, /missing keyword/, bug8139) {o.bar(c: bug8139)}
+    assert_raise_with_message(ArgumentError, /missing keyword/, bug8139) {o.bar}
   end
 
   def test_block_required_keyword
@@ -321,7 +322,7 @@ class TestKeywordArguments < Test::Unit::TestCase
     b = assert_nothing_raised(SyntaxError, feature7701) do
       break eval("proc {|a:| a}")
     end
-    assert_raise(ArgumentError, feature7701) {b.call}
+    assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {b.call}
     assert_equal(42, b.call(a: 42), feature7701)
     assert_equal([[:keyreq, :a]], b.parameters, feature7701)
 
@@ -330,9 +331,10 @@ class TestKeywordArguments < Test::Unit::TestCase
       break eval("proc {|a:, **b| [a, b]}")
     end
     assert_equal([42, {}], b.call(a: 42), feature7701)
+    assert_equal([42, {c: feature7701}], b.call(a: 42, c: feature7701), feature7701)
     assert_equal([[:keyreq, :a], [:keyrest, :b]], b.parameters, feature7701)
-    assert_raise(ArgumentError, bug8139) {b.call(c: bug8139)}
-    assert_raise(ArgumentError, bug8139) {b.call}
+    assert_raise_with_message(ArgumentError, /missing keyword/, bug8139) {b.call(c: bug8139)}
+    assert_raise_with_message(ArgumentError, /missing keyword/, bug8139) {b.call}
   end
 
   def test_super_with_keyword