kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Allow strings in assert_pattern_list

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-08-18 23:42:53 +09:00
parent 8c44b07fa4
commit d903e76726
Notes: git 2022-08-19 01:28:54 +09:00 
Merged: https://github.com/ruby/ruby/pull/6252
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tool/lib/core_assertions.rb
View file

@ -548,11 +548,13 @@ eom
anchored = false anchored = false
else else
if anchored if anchored
match = /\A#{pattern}/.match(rest) match = rest.rindex(pattern, 0)
else else
match = pattern.match(rest) match = rest.index(pattern)
end end
unless match if match
post_match = $~ ? $~.post_match : rest[match+pattern.size..-1]
else
msg = message(msg) { msg = message(msg) {
expect_msg = "Expected #{mu_pp pattern}\n" expect_msg = "Expected #{mu_pp pattern}\n"
if /\n[^\n]/ =~ rest if /\n[^\n]/ =~ rest
@ -569,7 +571,7 @@ eom
} }
assert false, msg assert false, msg
end end
rest = match.post_match rest = post_match
anchored = true anchored = true
end end
} }

8
tool/test/testunit/test_assertion.rb
View file

@ -35,6 +35,14 @@ class TestAssertion < Test::Unit::TestCase
assert_pattern_list([:*, /foo?/], "afoo") assert_pattern_list([:*, /foo?/], "afoo")
assert_not_pattern_list([:*, /foo?/], "afoo?") assert_not_pattern_list([:*, /foo?/], "afoo?")
assert_pattern_list([/foo?/, :*], "foo?") assert_pattern_list([/foo?/, :*], "foo?")
assert_not_pattern_list(["foo?"], "foo")
assert_not_pattern_list(["foo?"], "afoo")
assert_pattern_list(["foo?"], "foo?")
assert_not_pattern_list([:*, "foo?", :*], "foo")
assert_not_pattern_list([:*, "foo?"], "afoo")
assert_pattern_list([:*, "foo?"], "afoo?")
assert_pattern_list(["foo?", :*], "foo?")
end end
def assert_not_pattern_list(pattern_list, actual, message=nil) def assert_not_pattern_list(pattern_list, actual, message=nil)