From 7be0bd894bcc0aad2e41c1c80aa40cd81b5ea735 Mon Sep 17 00:00:00 2001 From: suke Date: Mon, 13 Oct 2008 00:03:11 +0000 Subject: * ext/win32ole/win32ole.c (load_conv_function51932): support CP51932 on cygwin and mingw32. thanks to arton. * test/win32ole/test_win32ole.rb (test_cp51932): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/win32ole/test_win32ole.rb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb index 44d9a3507..983c47929 100644 --- a/test/win32ole/test_win32ole.rb +++ b/test/win32ole/test_win32ole.rb @@ -365,20 +365,12 @@ if defined?(WIN32OLE) cp = WIN32OLE.codepage begin obj = WIN32OLE_VARIANT.new([0x3042].pack("U*").force_encoding("UTF-8")) - # mswin32 ruby only supports CP51932 - if /mswin/ =~ RUBY_PLATFORM - begin - WIN32OLE.codepage = 51932 - rescue - end - if WIN32OLE.codepage == 51932 - assert_equal("\xA4\xA2".force_encoding("CP51932"), obj.value) - end - else - # cygwin, mingw32 ruby does not support CP51932 - assert_raise(WIN32OLERuntimeError) { - WIN32OLE.codepage = 51932 - } + begin + WIN32OLE.codepage = 51932 + rescue + end + if WIN32OLE.codepage == 51932 + assert_equal("\xA4\xA2".force_encoding("CP51932"), obj.value) end ensure WIN32OLE.codepage = cp -- cgit