nobu	2012-09-05 12:03:24 +0900 (Wed, 05 Sep 2012)

  New Revision: 36904

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36904

  Log:
    test_dir_m17n.rb: test_glob_incompatible
    
    * test/ruby/test_dir_m17n.rb (TestDir_M17N#test_glob_incompatible):
      move from test_dir.rb.

  Modified files:
    trunk/test/ruby/test_dir.rb
    trunk/test/ruby/test_dir_m17n.rb

Index: test/ruby/test_dir.rb
===================================================================
--- test/ruby/test_dir.rb	(revision 36903)
+++ test/ruby/test_dir.rb	(revision 36904)
@@ -164,11 +164,6 @@
 
     assert_equal([File.join(@root, "a")], Dir.glob(File.join(@root, 'a\\')))
     assert_equal((?a..?f).map {|f| File.join(@root, f) }.sort, Dir.glob(File.join(@root, '[abc/def]')).sort)
-
-    d = "\u{3042}\u{3044}".encode("utf-16le")
-    assert_raise(Encoding::CompatibilityError) {Dir.glob(d)}
-    m = Class.new {define_method(:to_path) {d}}
-    assert_raise(Encoding::CompatibilityError) {Dir.glob(m.new)}
   end
 
   def test_foreach
Index: test/ruby/test_dir_m17n.rb
===================================================================
--- test/ruby/test_dir_m17n.rb	(revision 36903)
+++ test/ruby/test_dir_m17n.rb	(revision 36904)
@@ -262,4 +262,11 @@
     }
     assert_equal(paths.map(&:encoding), encs, bug6072)
   end
+
+  def test_glob_incompatible
+    d = "\u{3042}\u{3044}".encode("utf-16le")
+    assert_raise(Encoding::CompatibilityError) {Dir.glob(d)}
+    m = Class.new {define_method(:to_path) {d}}
+    assert_raise(Encoding::CompatibilityError) {Dir.glob(m.new)}
+  end
 end

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