diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-02 13:22:42 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-02 13:22:42 +0000 |
| commit | 2d45869c7623b166d02fa07cbb6cf8a39cc81a8b (patch) | |
| tree | ae1c58e5dfaf31748df098ba0a6601a1d60f5595 /test/win32ole/test_err_in_callback.rb | |
| parent | 510d2a7d2e6030a489409c76fd49273214e2e2c2 (diff) | |
| download | ruby-2d45869c7623b166d02fa07cbb6cf8a39cc81a8b.tar.gz | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole/test_err_in_callback.rb')
| -rw-r--r-- | test/win32ole/test_err_in_callback.rb | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb index c223804ce6..d686aa23df 100644 --- a/test/win32ole/test_err_in_callback.rb +++ b/test/win32ole/test_err_in_callback.rb @@ -21,27 +21,12 @@ if defined?(WIN32OLE) " -I " + e }.join("") @script = File.dirname(__FILE__) + "/err_in_callback.rb" - @param = create_temp_html - @param = "file:///" + @param.gsub(/\\/, '/') end end - def create_temp_html - fso = WIN32OLE.new('Scripting.FileSystemObject') - @dummy_file = fso.GetTempName + ".html" - cfolder = fso.getFolder(".") - @str = "This is test HTML file for Win32OLE (#{Time.now})" - f = cfolder.CreateTextFile(@dummy_file) - f.writeLine("<html><body><div id='str'>#{@str}</div></body></html>") - f.close - @f = @dummy_file - dummy_path = cfolder.path + "\\" + @dummy_file - dummy_path - end - def test_err_in_callback if @ruby - cmd = "#{@ruby} -v #{@iopt} #{@script} #{@param} > test_err_in_callback.log 2>&1" + cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1" system(cmd) str = "" open("test_err_in_callback.log") {|ifs| @@ -51,34 +36,5 @@ if defined?(WIN32OLE) end end - def ie_quit - WIN32OLE_EVENT.message_loop - sh = WIN32OLE.new('Shell.Application') - sh.windows.each do |w| - i = 0 - begin - i = i + 1 - next if i > 100 - WIN32OLE_EVENT.message_loop - sleep 0.1 - next if /#{@dummy_file}/ !~ w.locationURL - e = w.document.all.item("str") - if e && e.innerHTML == @str - w.quit - WIN32OLE_EVENT.message_loop - sleep 0.2 - break - end - rescue - retry - end - end - end - - def teardown - ie_quit - File.unlink(@f) - File.unlink("test_err_in_callback.log") - end end end |