Get rid of toplevel methods

1 files changed, 8 insertions, 22 deletions

diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb
index 0c819fccd7..d8e162596b 100644
--- a/test/win32ole/test_win32ole_event.rb
+++ b/test/win32ole/test_win32ole_event.rb
@@ -5,8 +5,7 @@ rescue LoadError
 end
 require 'test/unit'
 
-def ado_installed?
-  installed = false
+ado_installed =
   if defined?(WIN32OLE)
     db = nil
     begin
@@ -15,24 +14,19 @@ def ado_installed?
       db.open
       db.close
       db = nil
-      installed = true
+      true
     rescue
     end
   end
-  installed
-end
 
-def swbemsink_available?
-  available = false
+swbemsink_available =
   if defined?(WIN32OLE)
     begin
       WIN32OLE.new('WbemScripting.SWbemSink')
-      available = true
+      true
     rescue
     end
   end
-  available
-end
 
 if defined?(WIN32OLE_EVENT)
   class TestWIN32OLE_EVENT < Test::Unit::TestCase
@@ -49,12 +43,8 @@ if defined?(WIN32OLE_EVENT)
     end
   end
 
-  class TestWIN32OLE_EVENT_SWbemSink < Test::Unit::TestCase
-    unless swbemsink_available?
-      def test_dummy_for_skip_message
-        skip "'WbemScripting.SWbemSink' is not available"
-      end
-    else
+  if swbemsink_available
+    class TestWIN32OLE_EVENT_SWbemSink < Test::Unit::TestCase
       def setup
         @wmi = WIN32OLE.connect('winmgmts://localhost/root/cimv2')
         @sws = WIN32OLE.new('WbemScripting.SWbemSink')
@@ -166,12 +156,8 @@ if defined?(WIN32OLE_EVENT)
     end
   end
 
-  class TestWIN32OLE_EVENT_ADO < Test::Unit::TestCase
-    unless ado_installed?
-      def test_dummy_for_skip_message
-        skip "ActiveX Data Object Library not found"
-      end
-    else
+  if ado_installed
+    class TestWIN32OLE_EVENT_ADO < Test::Unit::TestCase
       CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
       module ADO
       end