usa	2012-08-07 10:48:36 +0900 (Tue, 07 Aug 2012)

  New Revision: 36649

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

  Log:
    * test/ruby/test_file_exhaustive.rb
      (TestFileExhaustive#test_expand_path*): refactoring.  split the method
      into some chunks of the same kind of tests.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_file_exhaustive.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36648)
+++ ChangeLog	(revision 36649)
@@ -1,3 +1,9 @@
+Tue Aug  7 10:46:37 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_expand_path*): refactoring.  split the method
+	  into some chunks of the same kind of tests.
+
 Tue Aug  7 00:31:09 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* class.c (rb_special_singleton_class_of): utility function.
Index: test/ruby/test_file_exhaustive.rb
===================================================================
--- test/ruby/test_file_exhaustive.rb	(revision 36648)
+++ test/ruby/test_file_exhaustive.rb	(revision 36649)
@@ -409,6 +409,9 @@
     else
       assert_equal("/foo", File.expand_path('/foo'))
     end
+  end
+
+  def test_expand_path_encoding
     drive = (DRIVE ? 'C:' : '')
     if Encoding.find("filesystem") == Encoding::CP1251
       a = "#{drive}/\u3042\u3044\u3046\u3048\u304a".encode("cp932")
@@ -425,6 +428,10 @@
       assert_equal(expected.force_encoding(cp), File.expand_path(a.dup.force_encoding(cp)), cp)
     end
 
+    assert_incompatible_encoding {|d| File.expand_path(d)}
+  end
+
+  def test_expand_path_home
     assert_kind_of(String, File.expand_path("~")) if ENV["HOME"]
     assert_raise(ArgumentError) { File.expand_path("~foo_bar_baz_unknown_user_wahaha") }
     assert_raise(ArgumentError) { File.expand_path("~foo_bar_baz_unknown_user_wahaha", "/") }
@@ -440,7 +447,6 @@
     ensure
       ENV["HOME"] = home
     end
-    assert_incompatible_encoding {|d| File.expand_path(d)}
   end
 
   def test_basename

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