From 9ef55da91006a19dc4fb612c735b335175b3259b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 9 Oct 2013 08:43:12 +0000 Subject: test/unit/assertions.rb: return exception * lib/test/unit/assertions.rb (assert_raise_with_message): return raised exception same as assert_raise. * test/ruby, test/-ext-: use assert_raise_with_message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_sprintf.rb | 54 ++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) (limited to 'test/ruby/test_sprintf.rb') diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index 21329dcd66..aba71153ee 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -325,70 +325,52 @@ class TestSprintf < Test::Unit::TestCase def test_named_untyped assert_equal("value", sprintf("%s", :key => "value")) - e = assert_raise(ArgumentError) {sprintf("%1$s", :key => "value")} - assert_equal("named after numbered", e.message) - e = assert_raise(ArgumentError) {sprintf("%s%s%s", "foo", "bar", :key => "value")} - assert_equal("named after unnumbered(2)", e.message) - e = assert_raise(ArgumentError) {sprintf("%s", :key => "value")} - assert_equal("named after ", e.message) - e = assert_raise(KeyError) {sprintf("%s", {})} - assert_equal("key not found", e.message) + assert_raise_with_message(ArgumentError, "named after numbered") {sprintf("%1$s", :key => "value")} + assert_raise_with_message(ArgumentError, "named after unnumbered(2)") {sprintf("%s%s%s", "foo", "bar", :key => "value")} + assert_raise_with_message(ArgumentError, "named after ") {sprintf("%s", :key => "value")} + assert_raise_with_message(KeyError, "key not found") {sprintf("%s", {})} end def test_named_untyped_enc key = "\u{3012}" [Encoding::UTF_8, Encoding::EUC_JP].each do |enc| k = key.encode(enc) - e = assert_raise(ArgumentError) {sprintf("%1$<#{k}>s", key: "value")} + e = assert_raise_with_message(ArgumentError, "named<#{k}> after numbered") {sprintf("%1$<#{k}>s", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named<#{k}> after numbered", e.message) - e = assert_raise(ArgumentError) {sprintf("%s%s%<#{k}>s", "foo", "bar", key: "value")} + e = assert_raise_with_message(ArgumentError, "named<#{k}> after unnumbered(2)") {sprintf("%s%s%<#{k}>s", "foo", "bar", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named<#{k}> after unnumbered(2)", e.message) - e = assert_raise(ArgumentError) {sprintf("%<#{k}>s", key: "value")} + e = assert_raise_with_message(ArgumentError, "named<#{k}> after ") {sprintf("%<#{k}>s", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named<#{k}> after ", e.message) - e = assert_raise(ArgumentError) {sprintf("%<#{k}>s", k.to_sym => "value")} + e = assert_raise_with_message(ArgumentError, "named after <#{k}>") {sprintf("%<#{k}>s", k.to_sym => "value")} assert_equal(enc, e.message.encoding) - assert_equal("named after <#{k}>", e.message) - e = assert_raise(KeyError) {sprintf("%<#{k}>s", {})} + e = assert_raise_with_message(KeyError, "key<#{k}> not found") {sprintf("%<#{k}>s", {})} assert_equal(enc, e.message.encoding) - assert_equal("key<#{k}> not found", e.message) end end def test_named_typed assert_equal("value", sprintf("%{key}", :key => "value")) - e = assert_raise(ArgumentError) {sprintf("%1${key2}", :key => "value")} - assert_equal("named{key2} after numbered", e.message) - e = assert_raise(ArgumentError) {sprintf("%s%s%{key2}", "foo", "bar", :key => "value")} - assert_equal("named{key2} after unnumbered(2)", e.message) - e = assert_raise(ArgumentError) {sprintf("%{key2}", :key => "value")} - assert_equal("named{key2} after ", e.message) + assert_raise_with_message(ArgumentError, "named{key2} after numbered") {sprintf("%1${key2}", :key => "value")} + assert_raise_with_message(ArgumentError, "named{key2} after unnumbered(2)") {sprintf("%s%s%{key2}", "foo", "bar", :key => "value")} + assert_raise_with_message(ArgumentError, "named{key2} after ") {sprintf("%{key2}", :key => "value")} assert_equal("value{key2}", sprintf("%{key}{key2}", :key => "value")) - e = assert_raise(KeyError) {sprintf("%{key}", {})} - assert_equal("key{key} not found", e.message) + assert_raise_with_message(KeyError, "key{key} not found") {sprintf("%{key}", {})} end def test_named_typed_enc key = "\u{3012}" [Encoding::UTF_8, Encoding::EUC_JP].each do |enc| k = key.encode(enc) - e = assert_raise(ArgumentError) {sprintf("%1${#{k}}s", key: "value")} + e = assert_raise_with_message(ArgumentError, "named{#{k}} after numbered") {sprintf("%1${#{k}}s", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named{#{k}} after numbered", e.message) - e = assert_raise(ArgumentError) {sprintf("%s%s%{#{k}}s", "foo", "bar", key: "value")} + e = assert_raise_with_message(ArgumentError, "named{#{k}} after unnumbered(2)") {sprintf("%s%s%{#{k}}s", "foo", "bar", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named{#{k}} after unnumbered(2)", e.message) - e = assert_raise(ArgumentError) {sprintf("%{#{k}}s", key: "value")} + e = assert_raise_with_message(ArgumentError, "named{#{k}} after ") {sprintf("%{#{k}}s", key: "value")} assert_equal(enc, e.message.encoding) - assert_equal("named{#{k}} after ", e.message) - e = assert_raise(ArgumentError) {sprintf("%<#{k}>{key}s", k.to_sym => "value")} + e = assert_raise_with_message(ArgumentError, "named{key} after <#{k}>") {sprintf("%<#{k}>{key}s", k.to_sym => "value")} assert_equal(enc, e.message.encoding) - assert_equal("named{key} after <#{k}>", e.message) - e = assert_raise(KeyError) {sprintf("%{#{k}}", {})} + e = assert_raise_with_message(KeyError, "key{#{k}} not found") {sprintf("%{#{k}}", {})} assert_equal(enc, e.message.encoding) - assert_equal("key{#{k}} not found", e.message) end end end -- cgit v1.2.1