suke	2008-02-16 13:38:06 +0900 (Sat, 16 Feb 2008)

  New Revision: 15502

  Modified files:
    trunk/test/win32ole/test_folderitem2_invokeverb.rb
    trunk/test/win32ole/test_win32ole.rb

  Log:
    modify test according to changing WIN32OLE.codepage behavior.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/win32ole/test_folderitem2_invokeverb.rb?r1=15502&r2=15501&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/win32ole/test_win32ole.rb?r1=15502&r2=15501&diff_format=u

Index: test/win32ole/test_win32ole.rb
===================================================================
--- test/win32ole/test_win32ole.rb	(revision 15501)
+++ test/win32ole/test_win32ole.rb	(revision 15502)
@@ -271,12 +271,14 @@
     # end
 
     def test_s_codepage_set
+      cp = WIN32OLE.codepage
       WIN32OLE.codepage = WIN32OLE::CP_UTF8
       assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
-      WIN32OLE.codepage = WIN32OLE::CP_ACP
+      WIN32OLE.codepage = cp
     end
 
     def test_s_codepage_changed
+      cp = WIN32OLE.codepage
       fso = WIN32OLE.new("Scripting.FileSystemObject")
       fname = fso.getTempName
       begin
@@ -326,7 +328,7 @@
         end
 
       ensure
-        WIN32OLE.codepage = WIN32OLE::CP_ACP
+        WIN32OLE.codepage = cp
         if (File.exist?(fname))
           File.unlink(fname)
         end
Index: test/win32ole/test_folderitem2_invokeverb.rb
===================================================================
--- test/win32ole/test_folderitem2_invokeverb.rb	(revision 15501)
+++ test/win32ole/test_folderitem2_invokeverb.rb	(revision 15502)
@@ -35,6 +35,11 @@
       # 
       verbs = @fi2.verbs
       verbs.extend(Enumerable)
+      @cp = WIN32OLE.codepage
+      begin
+        WIN32OLE.codepage = 932
+      rescue
+      end
       @shortcut = verbs.collect{|verb| 
         verb.name
       }.find {|name|
@@ -77,6 +82,7 @@
       if @dummy_path
         @fso.deleteFile(@dummy_path)
       end
+      WIN32OLE.codepage = @cp
     end
 
   end

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