akr	2007-12-22 15:00:56 +0900 (Sat, 22 Dec 2007)

  New Revision: 14466

  Modified files:
    trunk/test/ruby/test_m17n.rb

  Log:
    update tests for latest /.../n handling.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_m17n.rb?r1=14466&r2=14465

Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 14465)
+++ test/ruby/test_m17n.rb	(revision 14466)
@@ -224,24 +224,34 @@
     }
   end
 
+  def test_regexp_ascii_none
+    begin
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
+
+      assert_regexp_generic_ascii(/a/n)
+
+      [/a/n].each {|r|
+        assert_equal(0, r =~ a("a"))
+        assert_equal(0, r =~ e("a"))
+        assert_equal(0, r =~ s("a"))
+        assert_equal(0, r =~ u("a"))
+        assert_equal(nil, r =~ a("\xc2\xa1"))
+        assert_equal(nil, r =~ e("\xc2\xa1"))
+        assert_equal(nil, r =~ s("\xc2\xa1"))
+        assert_equal(nil, r =~ u("\xc2\xa1"))
+      }
+    ensure
+      $VERBOSE = old_verbose
+    end
+  end
+
   def test_regexp_ascii
-    assert_regexp_fixed_ascii8bit(/a/n)
     assert_regexp_fixed_ascii8bit(/\xc2\xa1/n)
     assert_regexp_fixed_ascii8bit(eval(a(%{/\xc2\xa1/})))
     assert_regexp_fixed_ascii8bit(eval(a(%{/\xc2\xa1/n})))
     assert_regexp_fixed_ascii8bit(eval(a(%q{/\xc2\xa1/})))
 
-    [/a/n].each {|r|
-      assert_equal(0, r =~ a("a"))
-      assert_equal(0, r =~ e("a"))
-      assert_equal(0, r =~ s("a"))
-      assert_equal(0, r =~ u("a"))
-      assert_equal(nil, r =~ a("\xc2\xa1"))
-      assert_raise(ArgumentError) { r =~ e("\xc2\xa1") }
-      assert_raise(ArgumentError) { r =~ s("\xc2\xa1") }
-      assert_raise(ArgumentError) { r =~ u("\xc2\xa1") }
-    }
-
     [/\xc2\xa1/n, eval(a(%{/\xc2\xa1/})), eval(a(%{/\xc2\xa1/n}))].each {|r|
       assert_equal(nil, r =~ a("a"))
       assert_equal(nil, r =~ e("a"))
@@ -380,7 +390,7 @@
 
   def test_union_1_regexp
     assert_regexp_generic_ascii(Regexp.union(//))
-    assert_regexp_fixed_ascii8bit(Regexp.union(//n))
+    assert_regexp_generic_ascii(Regexp.union(//n))
     assert_regexp_fixed_eucjp(Regexp.union(//e))
     assert_regexp_fixed_sjis(Regexp.union(//s))
     assert_regexp_fixed_utf8(Regexp.union(//u))
@@ -421,7 +431,7 @@
   end
 
   def test_dynamic_ascii_regexp
-    assert_regexp_fixed_ascii8bit(/#{}/n)
+    assert_regexp_generic_ascii(/#{}/n)
     assert_regexp_fixed_ascii8bit(/#{}\xc2\xa1/n)
     assert_regexp_fixed_ascii8bit(/\xc2\xa1#{}/n)
     #assert_raise(SyntaxError) { s1, s2 = s('\xc2'), s('\xa1'); /#{s1}#{s2}/ }

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