From 819b604037c317d2b53a1aaca67aef25da2d5ec9 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 23 Dec 2019 02:34:16 -0500 Subject: Reword keyword arguments warning messages to convey these are deprecation warnings --- test/ruby/test_proc.rb | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'test/ruby/test_proc.rb') diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index cd5c4458b0..c6572ec1ba 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1485,27 +1485,27 @@ class TestProcKeywords < Test::Unit::TestCase g = ->(kw) { kw.merge(:a=>2) } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1515,27 +1515,27 @@ class TestProcKeywords < Test::Unit::TestCase f = ->(**kw) { kw.merge(:a=>1) }.method(:call) g = ->(kw) { kw.merge(:a=>2) }.method(:call) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1549,27 +1549,27 @@ class TestProcKeywords < Test::Unit::TestCase def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `call'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*The called method `call'/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1582,27 +1582,27 @@ class TestProcKeywords < Test::Unit::TestCase def g.>>(f) to_proc >> f end assert_equal(1, (f << g).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call(a: 3)[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (g << f).call(a: 3)[:a]) end assert_equal(1, (g >> f).call(a: 3)[:a]) - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end assert_equal(1, (f << g).call(**{})[:a]) - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method `call'/m) do + assert_warn(/Passing the keyword argument as the last hash parameter is deprecated.*Using the last argument as keyword parameters is deprecated.*The called method `call'/m) do assert_equal(2, (f >> g).call(**{})[:a]) end end -- cgit v1.2.3