From 4622664c43867b12ba08b3d298e253495c07db17 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Jan 2008 14:36:14 +0000
Subject: * test/win32ole/test_win32ole.rb: ruby's encoding support.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/win32ole/test_win32ole.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/win32ole/test_win32ole.rb')

diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb
index d5174b6022..82ba632352 100644
--- a/test/win32ole/test_win32ole.rb
+++ b/test/win32ole/test_win32ole.rb
@@ -42,17 +42,17 @@ if defined?(WIN32OLE)
       exc = assert_raise(WIN32OLERuntimeError) {
         @dict1.add
       }
-      assert_match(/^\(in OLE method `add': \)/, exc.message)
+      assert_match(/^\(in OLE method `add': \)/, exc.message) #`
 
       exc = assert_raise(WIN32OLERuntimeError) {
         @dict1._invoke(1, [], [])
       }
-      assert_match(/^\(in OLE method `<dispatch id:1>': \)/, exc.message)
+      assert_match(/^\(in OLE method `<dispatch id:1>': \)/, exc.message) #`
 
       exc = assert_raise(WIN32OLERuntimeError) {
         @dict1.compareMode = -1
       }
-      assert_match(/^\(in setting property `compareMode': \)/, exc.message)
+      assert_match(/^\(in setting property `compareMode': \)/, exc.message) #`
     end
 
     def test_ole_methods
@@ -156,7 +156,7 @@ if defined?(WIN32OLE)
       exc = assert_raise(WIN32OLERuntimeError) {
         WIN32OLE.new("{000}")
       }
-      assert_match(/unknown OLE server: `\{000\}'/, exc.message)
+      assert_match(/unknown OLE server: `\{000\}'/, exc.message) #`
     end
 
     def test_s_connect
@@ -279,14 +279,14 @@ if defined?(WIN32OLE)
       begin
         WIN32OLE.codepage = WIN32OLE::CP_UTF8
         obj = WIN32OLE_VARIANT.new([0x3042].pack("U*"))
-        assert_equal("\xE3\x81\x82", obj.value)
+        assert_equal("\xE3\x81\x82".force_encoding("CP65001"), obj.value)
 
         begin
           WIN32OLE.codepage = 932 # Windows-31J
         rescue WIN32OLERuntimeError
         end
         if (WIN32OLE.codepage == 932)
-          assert_equal("\x82\xA0", obj.value)
+          assert_equal("\x82\xA0".force_encoding("CP932"), obj.value)
         end
 
         begin
@@ -294,7 +294,7 @@ if defined?(WIN32OLE)
         rescue WIN32OLERuntimeError
         end
         if (WIN32OLE.codepage == 20932)
-          assert_equal("\xA4\xA2", obj.value)
+          assert_equal("\xA4\xA2".force_encoding("CP20932"), obj.value)
         end
 
         WIN32OLE.codepage = WIN32OLE::CP_UTF8
-- 
cgit v1.2.3