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

test_m17n_comb.rb: refine assertions

Browse source 
* test/ruby/test_m17n_comb.rb (test_str_scan): refine assertion
  messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-27 09:08:51 +00:00
parent 7c9f1aa3d5
commit 2dc8f669a8
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/ruby/test_m17n_comb.rb
View file

@ -1036,25 +1036,26 @@ class TestM17NComb < Test::Unit::TestCase
def test_str_scan
combination(STRINGS, STRINGS) {|s1, s2|
desc = proc {"#{s1.dump}.scan(#{s2.dump})"}
if !s2.valid_encoding?
assert_raise(RegexpError) { s1.scan(s2) }
assert_raise(RegexpError, desc) { s1.scan(s2) }
next
end
if !s1.ascii_only? && !s2.ascii_only? && s1.encoding != s2.encoding
if s1.valid_encoding?
assert_raise(Encoding::CompatibilityError) { s1.scan(s2) }
assert_raise(Encoding::CompatibilityError, desc) { s1.scan(s2) }
else
assert_match(/invalid byte sequence/, assert_raise(ArgumentError) { s1.scan(s2) }.message)
assert_raise_with_message(ArgumentError, /invalid byte sequence/, desc) { s1.scan(s2) }
end
next
end
if !s1.valid_encoding?
assert_raise(ArgumentError) { s1.scan(s2) }
assert_raise(ArgumentError, desc) { s1.scan(s2) }
next
end
r = enccall(s1, :scan, s2)
r.each {|t|
assert_equal(s2, t)
assert_equal(s2, t, desc)
}
}
end