diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/rake/test_win32.rb | 37 |
2 files changed, 11 insertions, 31 deletions
@@ -1,4 +1,7 @@ -Thu Jun 3 13:05:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Jun 3 18:17:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] diff --git a/test/rake/test_win32.rb b/test/rake/test_win32.rb index 07db16c140..dade540629 100644 --- a/test/rake/test_win32.rb +++ b/test/rake/test_win32.rb @@ -9,47 +9,24 @@ class Rake::TestWin32 < Test::Unit::TestCase 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 @@ class Rake::TestWin32 < Test::Unit::TestCase '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 |