From 9b5a1329f5d1b1b2a3ad2b4cfa90506b015c0755 Mon Sep 17 00:00:00 2001 From: suke Date: Sat, 13 Oct 2018 03:18:42 +0000 Subject: use ADODB.Connection instead of Microsoft Internet Controls. * test/win32ole/test_win32ole_type.rb: remove test using Microsoft Internet Controls. * test/win32ole/test_win32ole_type_event.rb: some test uses ADODB.Connection. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/win32ole/test_win32ole_type.rb | 52 +------------------------------------ 1 file changed, 1 insertion(+), 51 deletions(-) (limited to 'test/win32ole/test_win32ole_type.rb') diff --git a/test/win32ole/test_win32ole_type.rb b/test/win32ole/test_win32ole_type.rb index ce11e0235f..485b390d5c 100644 --- a/test/win32ole/test_win32ole_type.rb +++ b/test/win32ole/test_win32ole_type.rb @@ -175,62 +175,12 @@ if defined?(WIN32OLE_TYPE) assert_instance_of(Array, ole_types) assert_equal(1, ole_types.size) assert_match(/^IShellDispatch\d{0,1}$/, ole_types[0].name) - - ie_otype = WIN32OLE_TYPE.new("Microsoft Internet Controls", "InternetExplorer") - ole_types = ie_otype.implemented_ole_types - assert_equal(4, ole_types.size) - otype = ole_types.select{|t| t.name == "IWebBrowser2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "IWebBrowserApp"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents"} - assert_equal(1, otype.size) - end - - def test_default_ole_types - ie_otype = WIN32OLE_TYPE.new("Microsoft Internet Controls", "InternetExplorer") - ole_types = ie_otype.default_ole_types - otype = ole_types.select{|t| t.name == "IWebBrowser2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "IWebBrowserApp"} - assert_equal(0, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents"} - assert_equal(0, otype.size) - end - - def test_source_ole_types - ie_otype = WIN32OLE_TYPE.new("Microsoft Internet Controls", "InternetExplorer") - ole_types = ie_otype.source_ole_types - otype = ole_types.select{|t| t.name == "IWebBrowser2"} - assert_equal(0, otype.size) - otype = ole_types.select{|t| t.name == "IWebBrowserApp"} - assert_equal(0, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents"} - assert_equal(1, otype.size) - end - - def test_default_event_sources - ie_otype = WIN32OLE_TYPE.new("Microsoft Internet Controls", "InternetExplorer") - ole_types = ie_otype.default_event_sources - otype = ole_types.select{|t| t.name == "IWebBrowser2"} - assert_equal(0, otype.size) - otype = ole_types.select{|t| t.name == "IWebBrowserApp"} - assert_equal(0, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents2"} - assert_equal(1, otype.size) - otype = ole_types.select{|t| t.name == "DWebBrowserEvents"} - assert_equal(0, otype.size) end def test_inspect assert_equal("#", @ole_type.inspect) end + # WIN32OLE_TYPE.typelibs will be obsoleted. def test_s_typelibs tlibs = WIN32OLE_TYPE.typelibs.sort -- cgit v1.2.3