diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-16 12:06:23 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-16 12:06:23 +0000 |
commit | 6d7ddc3b297bfe6ca9f091c0097722b0422cc7e2 (patch) | |
tree | f19da6b9f2e7d56d1dae72113612168301bb2e45 /test/win32ole/test_win32ole_variant.rb | |
parent | 1c75d58165fef446d507ce6f05e50eeaa66772f7 (diff) | |
download | ruby-6d7ddc3b297bfe6ca9f091c0097722b0422cc7e2.tar.gz |
* test/win32ole/test_win32ole.rb (test_s_codepage_changed,
test_s_locale_set, test_s_locale_change): skip test if Japanese
locale is not installed. [ruby-core:23806]
* test/win32ole/test_win32ole_variant.rb (test_conversion_str2cy):
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole/test_win32ole_variant.rb')
-rw-r--r-- | test/win32ole/test_win32ole_variant.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb index 7bf6caac49..d753fb4fc9 100644 --- a/test/win32ole/test_win32ole_variant.rb +++ b/test/win32ole/test_win32ole_variant.rb @@ -384,9 +384,15 @@ if defined?(WIN32OLE_VARIANT) def test_conversion_str2cy begin - WIN32OLE.locale = 0x0411 # set locale Japanese - obj = WIN32OLE_VARIANT.new("\\10,000", WIN32OLE::VARIANT::VT_CY) - assert_equal("10000", obj.value) + begin + WIN32OLE.locale = 0x0411 # set locale Japanese + rescue WIN32OLERuntimeError + STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_conversion_str2cy is skipped(Japanese locale is not installed)") + end + if WIN32OLE.locale == 0x0411 + obj = WIN32OLE_VARIANT.new("\\10,000", WIN32OLE::VARIANT::VT_CY) + assert_equal("10000", obj.value) + end ensure WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT end |