test/test_win32.rb in rake-0.8.3 vs test/test_win32.rb in rake-0.8.4

@@ -6,50 +6,65 @@
 
 require 'rake'
 
 class TestWin32 < Test::Unit::TestCase
   include InEnvironment
+  include TestMethods
 
   Win32 = Rake::Win32
-  
-  def test_win32_system_dir_uses_appdata_if_defined
-    in_environment('RAKE_SYSTEM' => nil, 'APPDATA' => '\\AD') do
-      assert_equal "/AD/Rake", Win32.win32_system_dir 
+
+  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_otherwise
+  def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'APPDATA' => nil,
+      'HOME' => nil,
       'HOMEDRIVE' => "C:",
-      "HOMEPATH" => "\\HP"
+      'HOMEPATH' => "\\HP"
       ) do
       assert_equal "C:/HP/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_uses_userprofile_otherwise
+  def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'APPDATA' => nil,
+      'HOME' => nil,
       'HOMEDRIVE' => nil,
-      "HOMEPATH" => nil,
-      "USERPROFILE" => '\\UP'
+      'HOMEPATH' => nil,
+      'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
       ) do
-      assert_equal "/UP/Rake", Win32.win32_system_dir
+      assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_nil_of_no_env_vars
+  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,
+      'HOME' => nil,
       'HOMEDRIVE' => nil,
       "HOMEPATH" => nil,
+      'APPDATA' => nil,
       "USERPROFILE" => nil
       ) do
-      assert_raise(Rake::Win32::Win32HomeError) do
+      assert_exception(Rake::Win32::Win32HomeError) do
         Win32.win32_system_dir
       end
     end
   end