summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-26 17:28:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-26 17:28:37 +0000
commit660a3298f5f19c136b530789c63ac2f6d422d771 (patch)
tree05247cc59a4f329acde9b1bfb4dc4b015580020d /test
parent331d6b341817370d51bf21a4ea74d59fed828c4d (diff)
merge revision(s) 34821:
* regparse.c (add_code_range_to_buf0): wrong condition of duplicated warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_regexp.rb17
1 files changed, 12 insertions, 5 deletions
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 9626f61eb3..3c1662efba 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -843,11 +843,18 @@ class TestRegexp < Test::Unit::TestCase
end
def test_dup_warn
- assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041]/\n!x", [], [])
- assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3042]/\n!x", [], /duplicated/u, nil,
- encoding: Encoding::UTF_8)
- assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041-\u3043]/\n!x", [], /duplicated/u, nil,
- encoding: Encoding::UTF_8)
+ assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3042]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3043]') }
+ assert_warn(/\A\z/) { Regexp.new('[\u3042\u3044\u3043]') }
+ assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043]') }
+ assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3044]') }
+ assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043-\u3044]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3042-\u3043]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3044-\u3045]') }
+ assert_warn(/\A\z/) { Regexp.new('[\u3042\u3046\u3044]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u1000-\u2000\u3042-\u3046\u3044]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u3044\u3041-\u3047]') }
+ assert_warn(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') }
end
def test_property_warn