diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-20 11:54:09 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-20 11:54:09 +0000 |
commit | 2fe69b221c990d756ae98c92a9c50e7d8da98e51 (patch) | |
tree | dea435e3535ac213bd6e1bb17ea037c5787b2d54 /test/win32ole | |
parent | 39a840d084d2f24d44deb7b506ca15924fa48589 (diff) | |
download | ruby-2fe69b221c990d756ae98c92a9c50e7d8da98e51.tar.gz |
refactoring define AvailableOLE.sysmon_available?
* test/win32ole/test_win32ole_type_event.rb: refactoring. use
AvailableOLE.sysmon_available?
* test/win32ole/available_ole.rb: define AvailableOLE.sysmon_available?
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole')
-rw-r--r-- | test/win32ole/available_ole.rb | 17 | ||||
-rw-r--r-- | test/win32ole/test_win32ole_type_event.rb | 9 |
2 files changed, 19 insertions, 7 deletions
diff --git a/test/win32ole/available_ole.rb b/test/win32ole/available_ole.rb new file mode 100644 index 0000000000..e697092032 --- /dev/null +++ b/test/win32ole/available_ole.rb @@ -0,0 +1,17 @@ +begin + require 'win32ole' +rescue LoadError +end + +if defined?(WIN32OLE) + module AvailableOLE + module_function + + def sysmon_available? + WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor') + true + rescue + false + end + end +end diff --git a/test/win32ole/test_win32ole_type_event.rb b/test/win32ole/test_win32ole_type_event.rb index 95dbf45dff..ad2de54e59 100644 --- a/test/win32ole/test_win32ole_type_event.rb +++ b/test/win32ole/test_win32ole_type_event.rb @@ -7,15 +7,10 @@ end require 'test/unit' if defined?(WIN32OLE_TYPE) - def sysmon_available? - WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor') - true - rescue - false - end + require_relative 'available_ole' class TestWIN32OLE_TYPE_EVENT < Test::Unit::TestCase - unless sysmon_available? + unless AvailableOLE.sysmon_available? def test_dummy_for_skip_message skip 'System Monitor Control is not available' end |