archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-28 07:26:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Revert "string.c: remove the deprecation warnings of String#bytes with block"

Browse source 
Forgot to write the ticket number in the commit log...

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-12-26 14:42:07 +00:00
parent 5281a0047f
commit 0df1de8b32
2 changed files with 71 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

88
test/ruby/test_string.rb
View file

@ -878,15 +878,20 @@ CODE
assert_equal [65, 66, 67], s.bytes {}
}
else
res = []
assert_equal s.object_id, s.bytes {|x| res << x }.object_id
assert_equal(65, res[0])
assert_equal(66, res[1])
assert_equal(67, res[2])
s = S("ABC")
res = []
assert_same s, s.bytes {|x| res << x }
assert_equal [65, 66, 67], res
warning = /passing a block to String#bytes is deprecated/
assert_warning(warning) {
res = []
assert_equal s.object_id, s.bytes {|x| res << x }.object_id
assert_equal(65, res[0])
assert_equal(66, res[1])
assert_equal(67, res[2])
}
assert_warning(warning) {
s = S("ABC")
res = []
assert_same s, s.bytes {|x| res << x }
assert_equal [65, 66, 67], res
}
end
end
@ -917,15 +922,20 @@ CODE
assert_equal [0x3042, 0x3044, 0x3046], s.codepoints {}
}
else
res = []
assert_equal s.object_id, s.codepoints {|x| res << x }.object_id
assert_equal(0x3042, res[0])
assert_equal(0x3044, res[1])
assert_equal(0x3046, res[2])
s = S("ABC")
res = []
assert_same s, s.codepoints {|x| res << x }
assert_equal [65, 66, 67], res
warning = /passing a block to String#codepoints is deprecated/
assert_warning(warning) {
res = []
assert_equal s.object_id, s.codepoints {|x| res << x }.object_id
assert_equal(0x3042, res[0])
assert_equal(0x3044, res[1])
assert_equal(0x3046, res[2])
}
assert_warning(warning) {
s = S("ABC")
res = []
assert_same s, s.codepoints {|x| res << x }
assert_equal [65, 66, 67], res
}
end
end
@ -950,11 +960,14 @@ CODE
assert_equal ["A", "B", "C"], s.chars {}
}
else
res = []
assert_equal s.object_id, s.chars {|x| res << x }.object_id
assert_equal("A", res[0])
assert_equal("B", res[1])
assert_equal("C", res[2])
warning = /passing a block to String#chars is deprecated/
assert_warning(warning) {
res = []
assert_equal s.object_id, s.chars {|x| res << x }.object_id
assert_equal("A", res[0])
assert_equal("B", res[1])
assert_equal("C", res[2])
}
end
end
@ -1019,14 +1032,17 @@ CODE
assert_equal ["A", "B", "C"], "ABC".grapheme_clusters {}
}
else
s = "ABC".b.taint
res = []
assert_same s, s.grapheme_clusters {|x| res << x }
assert_equal(3, res.size)
assert_equal("A", res[0])
assert_equal("B", res[1])
assert_equal("C", res[2])
res.each {|g| assert_predicate(g, :tainted?)}
warning = /passing a block to String#grapheme_clusters is deprecated/
assert_warning(warning) {
s = "ABC".b.taint
res = []
assert_same s, s.grapheme_clusters {|x| res << x }
assert_equal(3, res.size)
assert_equal("A", res[0])
assert_equal("B", res[1])
assert_equal("C", res[2])
res.each {|g| assert_predicate(g, :tainted?)}
}
end
end
@ -1139,10 +1155,12 @@ CODE
assert_equal ["hello\n", "world"], s.lines {}
}
else
res = []
assert_equal s.object_id, s.lines {|x| res << x }.object_id
assert_equal(S("hello\n"), res[0])
assert_equal(S("world"), res[1])
assert_warning(/passing a block to String#lines is deprecated/) {
res = []
assert_equal s.object_id, s.lines {|x| res << x }.object_id
assert_equal(S("hello\n"), res[0])
assert_equal(S("world"), res[1])
}
end
end