diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-13 03:18:42 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-13 03:18:42 +0000 |
commit | 9b5a1329f5d1b1b2a3ad2b4cfa90506b015c0755 (patch) | |
tree | c74eda09660ec46c23c885c2ce14bd4c62abebae | |
parent | 2e4d149d3128c3e05e7f1e782011ef17c77687c1 (diff) | |
download | ruby-9b5a1329f5d1b1b2a3ad2b4cfa90506b015c0755.tar.gz |
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
-rw-r--r-- | test/win32ole/test_win32ole_type.rb | 52 | ||||
-rw-r--r-- | test/win32ole/test_win32ole_type_event.rb | 54 |
2 files changed, 55 insertions, 51 deletions
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("#<WIN32OLE_TYPE:Shell>", @ole_type.inspect) end + # WIN32OLE_TYPE.typelibs will be obsoleted. def test_s_typelibs tlibs = WIN32OLE_TYPE.typelibs.sort diff --git a/test/win32ole/test_win32ole_type_event.rb b/test/win32ole/test_win32ole_type_event.rb new file mode 100644 index 0000000000..e1b5806b42 --- /dev/null +++ b/test/win32ole/test_win32ole_type_event.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: false +begin + require 'win32ole' +rescue LoadError +end +require "test/unit" + +if defined?(WIN32OLE_TYPE) + def ado_installed? + installed = false + if defined?(WIN32OLE) + begin + WIN32OLE.new('ADODB.Connection') + installed = true + rescue + end + end + installed + end + + class TestWIN32OLE_TYPE_EVENT < Test::Unit::TestCase + unless ado_installed? + def test_dummy_for_skip_message + skip 'ActiveX Data Object Library not found' + end + else + + def setup + typelib = WIN32OLE.new('ADODB.Connection').ole_typelib + @ole_type = WIN32OLE_TYPE.new(typelib.name, 'Connection') + end + + def test_implemented_ole_types + ole_types = @ole_type.implemented_ole_types.map(&:name).sort + assert_equal(['ConnectionEvents', '_Connection'], ole_types) + end + + def test_default_ole_types + ole_types = @ole_type.default_ole_types.map(&:name).sort + assert_equal(['ConnectionEvents', '_Connection'], ole_types) + end + + def test_source_ole_types + ole_types = @ole_type.source_ole_types.map(&:name) + assert_equal(['ConnectionEvents'], ole_types) + end + + def test_default_event_sources + event_sources = @ole_type.default_event_sources.map(&:name) + assert_equal(['ConnectionEvents'], event_sources) + end + end + end +end |