From 2fe69b221c990d756ae98c92a9c50e7d8da98e51 Mon Sep 17 00:00:00 2001 From: suke Date: Sat, 20 Oct 2018 11:54:09 +0000 Subject: 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 --- test/win32ole/available_ole.rb | 17 +++++++++++++++++ test/win32ole/test_win32ole_type_event.rb | 9 ++------- 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 test/win32ole/available_ole.rb (limited to 'test/win32ole') 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 -- cgit v1.2.3