[前][次][番号順一覧][スレッド一覧]

ruby-changes:55949

From: Hiroshi <ko1@a...>
Date: Sat, 1 Jun 2019 20:46:22 +0900 (JST)
Subject: [ruby-changes:55949] Hiroshi SHIBATA: 9eecd7a2fd (trunk): Ignore warnings about ambiguous first argument of regexp with assert match.

https://git.ruby-lang.org/ruby.git/commit/?id=9eecd7a2fd

From 9eecd7a2fd0b67aa13450887a1fee9a6638b9e4e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Sat, 1 Jun 2019 14:44:24 +0300
Subject: Ignore warnings about ambiguous first argument of regexp with assert
 match.


diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb
index 29b4a5b..6f32247 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 https://github.com/ruby/ruby/blob/trunk/test/json/json_common_interface_test.rb#L27
   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 f139b90..32dc890 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -234,8 +234,8 @@ class TestObjSpace < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/objspace/test_objspace.rb#L234
 
   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 https://github.com/ruby/ruby/blob/trunk/test/objspace/test_objspace.rb#L267
 
   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 https://github.com/ruby/ruby/blob/trunk/test/objspace/test_objspace.rb#L285
 
   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 https://github.com/ruby/ruby/blob/trunk/test/objspace/test_objspace.rb#L430
       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 dda70ac..9f58fef 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -283,9 +283,9 @@ class TestISeq < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_iseq.rb#L283
 
   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 75861ca..468c605 100644
--- a/test/webrick/test_httpresponse.rb
+++ b/test/webrick/test_httpresponse.rb
@@ -68,7 +68,7 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/test/webrick/test_httpresponse.rb#L68
       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
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]