nobu	2010-06-03 18:17:49 +0900 (Thu, 03 Jun 2010)

  New Revision: 28145

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

  Log:
    * test/rake/test_win32.rb (Rake::TestWin32): update tests.
      [ruby-core:30309]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/rake/test_win32.rb
    trunk/ChangeLog
    trunk/test/rake/test_win32.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28144)
+++ ChangeLog	(revision 28145)
@@ -1,5 +1,8 @@
-Thu Jun  3 13:05:15 2010  Nobuyoshi Nakada  <nobu@r...>
+Thu Jun  3 18:17:45 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* test/rake/test_win32.rb (Rake::TestWin32): update tests.
+	  [ruby-core:30309]
+
 	* test/io/nonblock/test_flush.rb (test_flush): try pipe and
 	  socketpair.  [ruby-dev:41517]
 
Index: test/rake/test_win32.rb
===================================================================
--- test/rake/test_win32.rb	(revision 28144)
+++ test/rake/test_win32.rb	(revision 28145)
@@ -9,47 +9,24 @@
   Win32 = Rake::Win32
 
   def test_win32_system_dir_uses_home_if_defined
-    in_environment('RAKE_SYSTEM' => nil, 'HOME' => 'C:\\HP') do
-      assert_equal "C:/HP/Rake", Win32.win32_system_dir
-    end
-  end
-
-  def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => "C:",
-      'HOMEPATH' => "\\HP"
+    in_environment('RAKE_SYSTEM' => nil,
+      'HOME' => "C:\\HP",
+      'APPDATA' => nil
       ) do
       assert_equal "C:/HP/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
+  def test_win32_system_dir_uses_appdata_if_defined
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
+      'HOME' => "C:\\HP",
       'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
       ) do
       assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_fallback_to_userprofile_otherwise
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
-      'APPDATA' => nil,
-      'USERPROFILE' => "C:\\Documents and Settings\\HP"
-      ) do
-      assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
-    end
-  end
-
   def test_win32_system_dir_nil_of_no_env_vars
     in_environment(
       'RAKE_SYSTEM' => nil,
@@ -57,9 +34,9 @@
       'HOMEDRIVE' => nil,
       "HOMEPATH" => nil,
       'APPDATA' => nil,
-      "USERPROFILE" => nil
+      'USERPROFILE' => "C:\\Documents and Settings\\HP"
       ) do
-      assert_raise(Rake::Win32::Win32HomeError) do
+      assert_raise(ArgumentError) do
         Win32.win32_system_dir
       end
     end
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28144)
+++ ruby_1_9_2/ChangeLog	(revision 28145)
@@ -1,5 +1,8 @@
-Thu Jun  3 13:05:15 2010  Nobuyoshi Nakada  <nobu@r...>
+Thu Jun  3 18:17:45 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* test/rake/test_win32.rb (Rake::TestWin32): update tests.
+	  [ruby-core:30309]
+
 	* test/io/nonblock/test_flush.rb (test_flush): try pipe and
 	  socketpair.  [ruby-dev:41517]
 
Index: ruby_1_9_2/test/rake/test_win32.rb
===================================================================
--- ruby_1_9_2/test/rake/test_win32.rb	(revision 28144)
+++ ruby_1_9_2/test/rake/test_win32.rb	(revision 28145)
@@ -9,47 +9,24 @@
   Win32 = Rake::Win32
 
   def test_win32_system_dir_uses_home_if_defined
-    in_environment('RAKE_SYSTEM' => nil, 'HOME' => 'C:\\HP') do
-      assert_equal "C:/HP/Rake", Win32.win32_system_dir
-    end
-  end
-
-  def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => "C:",
-      'HOMEPATH' => "\\HP"
+    in_environment('RAKE_SYSTEM' => nil,
+      'HOME' => "C:\\HP",
+      'APPDATA' => nil
       ) do
       assert_equal "C:/HP/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
+  def test_win32_system_dir_uses_appdata_if_defined
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
+      'HOME' => "C:\\HP",
       'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
       ) do
       assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_fallback_to_userprofile_otherwise
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
-      'APPDATA' => nil,
-      'USERPROFILE' => "C:\\Documents and Settings\\HP"
-      ) do
-      assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
-    end
-  end
-
   def test_win32_system_dir_nil_of_no_env_vars
     in_environment(
       'RAKE_SYSTEM' => nil,
@@ -57,9 +34,9 @@
       'HOMEDRIVE' => nil,
       "HOMEPATH" => nil,
       'APPDATA' => nil,
-      "USERPROFILE" => nil
+      'USERPROFILE' => "C:\\Documents and Settings\\HP"
       ) do
-      assert_raise(Rake::Win32::Win32HomeError) do
+      assert_raise(ArgumentError) do
         Win32.win32_system_dir
       end
     end

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