mirror of
https://github.com/ruby/ruby.git
synced 2025-08-27 15:06:10 +02:00

* ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise before invoking IConnectionPoint::Release. * test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb, test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object Library instead of InternetExplorer. -- * test/win32ole/test_err_in_callback.rb: add teardown. -- * test/win32ole/test_win32ole_event.rb: rename test class. * test/win32ole/test_win32ole_variant_outarg.rb: add in order to use ADO instead of Internet Explorer. remove test/win32ole/test_win32ole_variant_with_ie.rb. * test/win32ole/orig_data.csv: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
43 lines
1 KiB
Ruby
43 lines
1 KiB
Ruby
#
|
|
# test Win32OLE avoids cfp consistency error when the exception raised
|
|
# in WIN32OLE_EVENT handler block. [ruby-dev:35450]
|
|
#
|
|
|
|
begin
|
|
require 'win32ole'
|
|
rescue LoadError
|
|
end
|
|
require 'rbconfig'
|
|
if defined?(WIN32OLE)
|
|
require 'mkmf'
|
|
require 'test/unit'
|
|
class TestErrInCallBack < Test::Unit::TestCase
|
|
def setup
|
|
@ruby = nil
|
|
if File.exist?("./" + CONFIG["RUBY_INSTALL_NAME"] + CONFIG["EXEEXT"])
|
|
sep = File::ALT_SEPARATOR || "/"
|
|
@ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"]
|
|
@iopt = $:.map {|e|
|
|
" -I " + e
|
|
}.join("")
|
|
@script = File.dirname(__FILE__) + "/err_in_callback.rb"
|
|
end
|
|
end
|
|
|
|
def test_err_in_callback
|
|
if @ruby
|
|
cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1"
|
|
system(cmd)
|
|
str = ""
|
|
open("test_err_in_callback.log") {|ifs|
|
|
str = ifs.read
|
|
}
|
|
assert_match(/NameError/, str)
|
|
end
|
|
end
|
|
|
|
def teardown
|
|
File.unlink("test_err_in_callback.log")
|
|
end
|
|
end
|
|
end
|