diff options
| -rw-r--r-- | test/json/json_common_interface_test.rb | 6 | ||||
| -rw-r--r-- | test/objspace/test_objspace.rb | 20 | ||||
| -rw-r--r-- | test/ruby/test_iseq.rb | 4 | ||||
| -rw-r--r-- | test/webrick/test_httpresponse.rb | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb index 29b4a5b569..6f32247a05 100644 --- a/test/json/json_common_interface_test.rb +++ b/test/json/json_common_interface_test.rb @@ -27,15 +27,15 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase end def test_parser - assert_match /::Parser\z/, JSON.parser.name + assert_match(/::Parser\z/, JSON.parser.name) end def test_generator - assert_match /::Generator\z/, JSON.generator.name + assert_match(/::Generator\z/, JSON.generator.name) end def test_state - assert_match /::Generator::State\z/, JSON.state.name + assert_match(/::Generator::State\z/, JSON.state.name) end def test_create_id diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb index f139b90efe..32dc8901d8 100644 --- a/test/objspace/test_objspace.rb +++ b/test/objspace/test_objspace.rb @@ -234,8 +234,8 @@ class TestObjSpace < Test::Unit::TestCase def test_dump_flags info = ObjectSpace.dump("foo".freeze) - assert_match /"wb_protected":true, "old":true/, info - assert_match /"fstring":true/, info + assert_match(/"wb_protected":true, "old":true/, info) + assert_match(/"fstring":true/, info) JSON.parse(info) if defined?(JSON) end @@ -267,10 +267,10 @@ class TestObjSpace < Test::Unit::TestCase def assert_dump_object(info, line) loc = caller_locations(1, 1)[0] - assert_match /"type":"STRING"/, info - assert_match /"embedded":true, "bytesize":11, "value":"hello world", "encoding":"UTF-8"/, info - assert_match /"file":"#{Regexp.escape __FILE__}", "line":#{line}/, info - assert_match /"method":"#{loc.base_label}"/, info + assert_match(/"type":"STRING"/, info) + assert_match(/"embedded":true, "bytesize":11, "value":"hello world", "encoding":"UTF-8"/, info) + assert_match(/"file":"#{Regexp.escape __FILE__}", "line":#{line}/, info) + assert_match(/"method":"#{loc.base_label}"/, info) JSON.parse(info) if defined?(JSON) end @@ -285,8 +285,8 @@ class TestObjSpace < Test::Unit::TestCase def test_dump_dynamic_symbol dump = ObjectSpace.dump(("foobar%x" % rand(0x10000)).to_sym) - assert_match /"type":"SYMBOL"/, dump - assert_match /"value":"foobar\h+"/, dump + assert_match(/"type":"SYMBOL"/, dump) + assert_match(/"value":"foobar\h+"/, dump) end def test_dump_includes_imemo_type @@ -430,8 +430,8 @@ class TestObjSpace < Test::Unit::TestCase puts ObjectSpace.dump(File.allocate) RUBY assert_nil error - assert_match /"type":"FILE"/, output - assert_not_match /"fd":/, output + assert_match(/"type":"FILE"/, output) + assert_not_match(/"fd":/, output) end end diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb index dda70ac7dd..9f58fefc1f 100644 --- a/test/ruby/test_iseq.rb +++ b/test/ruby/test_iseq.rb @@ -283,9 +283,9 @@ class TestISeq < Test::Unit::TestCase def test_inspect %W[foo \u{30d1 30b9}].each do |name| - assert_match /@#{name}/, ISeq.compile("", name).inspect, name + assert_match(/@#{name}/, ISeq.compile("", name).inspect, name) m = ISeq.compile("class TestISeq::Inspect; def #{name}; end; instance_method(:#{name}); end").eval - assert_match /:#{name}@/, ISeq.of(m).inspect, name + assert_match(/:#{name}@/, ISeq.of(m).inspect, name) end end diff --git a/test/webrick/test_httpresponse.rb b/test/webrick/test_httpresponse.rb index 75861caf8f..468c60582d 100644 --- a/test/webrick/test_httpresponse.rb +++ b/test/webrick/test_httpresponse.rb @@ -68,7 +68,7 @@ module WEBrick io.rewind res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) assert_equal '300', res.code - refute_match /<img/, io.string + refute_match(/<img/, io.string) end def test_304_does_not_log_warning |