diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-08 13:00:06 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-08 13:00:06 +0000 |
| commit | dd4d9d63f08c78b9cffcdf106f6fa1e885774066 (patch) | |
| tree | 7744b607f3a65ab8962b2602c29aaaa3bc34cc72 | |
| parent | eb64061a384db53ca69dfdb1ab184a3b88d68f2d (diff) | |
* test/win32ole/test_propertyputref.rb (setup): fix typo.
* test/win32ole/test_win32ole_event.rb: should not use
InternetExplorer.gohome to test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/win32ole/test_propertyputref.rb | 2 | ||||
| -rw-r--r-- | test/win32ole/test_win32ole_event.rb | 34 |
3 files changed, 31 insertions, 12 deletions
@@ -1,3 +1,10 @@ +Thu Feb 8 21:35:16 2007 Masaki Suketa <[email protected]> + + * test/win32ole/test_propertyputref.rb (setup): fix typo. + + * test/win32ole/test_win32ole_event.rb: should not use + InternetExplorer.gohome to test. + Thu Feb 8 21:02:07 2007 Koichi Sasada <[email protected]> * thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION(). diff --git a/test/win32ole/test_propertyputref.rb b/test/win32ole/test_propertyputref.rb index 14b1a72e3d..4d34025623 100644 --- a/test/win32ole/test_propertyputref.rb +++ b/test/win32ole/test_propertyputref.rb @@ -9,7 +9,7 @@ if defined?(WIN32OLE) def setup begin @sapi = WIN32OLE.new('SAPI.SpVoice') - rescue WIN32OLERuntimeErro + rescue WIN32OLERuntimeError @sapi = nil end end diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb index 0945eac78b..8fd02b5e9b 100644 --- a/test/win32ole/test_win32ole_event.rb +++ b/test/win32ole/test_win32ole_event.rb @@ -6,12 +6,24 @@ require 'test/unit' if defined?(WIN32OLE_EVENT) class TestWIN32OLE_EVENT < Test::Unit::TestCase + def create_temp_html + fso = WIN32OLE.new('Scripting.FileSystemObject') + dummy_file = fso.GetTempName + ".html" + cfolder = fso.getFolder(".") + f = cfolder.CreateTextFile(dummy_file) + f.writeLine("<html><body>This is test HTML file for Win32OLE.</body></html>") + f.close + dummy_path = cfolder.path + "\\" + dummy_file + dummy_path + end + def setup @ie = WIN32OLE.new("InternetExplorer.Application") @ie.visible = true @event = "" @event2 = "" @event3 = "" + @f = create_temp_html end def default_handler(event, *args) @@ -21,9 +33,9 @@ if defined?(WIN32OLE_EVENT) def test_on_event ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev.on_event {|*args| default_handler(*args)} - @ie.gohome + @ie.navigate("file:///#{@f}") while @ie.busy - WIN32OLE_EVENT.message_loop + sleep 0.1 end assert_match(/BeforeNavigate/, @event) assert_match(/NavigateComplete/, @event) @@ -33,9 +45,9 @@ if defined?(WIN32OLE_EVENT) ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev.on_event('BeforeNavigate') {|*args| handler1} ev.on_event('BeforeNavigate') {|*args| handler2} - @ie.gohome + @ie.navigate("file:///#{@f}") while @ie.busy - WIN32OLE_EVENT.message_loop + sleep 0.1 end assert_equal("handler2", @event2) end @@ -44,9 +56,9 @@ if defined?(WIN32OLE_EVENT) ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev.on_event {|*args| handler1} ev.on_event {|*args| handler2} - @ie.gohome + @ie.navigate("file:///#{@f}") while @ie.busy - WIN32OLE_EVENT.message_loop + sleep 0.1 end assert_equal("handler2", @event2) end @@ -56,9 +68,9 @@ if defined?(WIN32OLE_EVENT) ev.on_event{|*args| handler1} ev.on_event{|*args| handler2} ev.on_event('NavigateComplete'){|*args| handler3(*args)} - @ie.gohome + @ie.navigate("file:///#{@f}") while @ie.busy - WIN32OLE_EVENT.message_loop + sleep 0.1 end assert(@event3!="") assert("handler2", @event2) @@ -68,9 +80,9 @@ if defined?(WIN32OLE_EVENT) ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev.on_event {|*args| default_handler(*args)} ev.on_event('NavigateComplete'){|*args| handler3(*args)} - @ie.gohome + @ie.navigate("file:///#{@f}") while @ie.busy - WIN32OLE_EVENT.message_loop + sleep 0.1 end assert_match(/BeforeNavigate/, @event) assert(/NavigateComplete/ !~ @event) @@ -90,10 +102,10 @@ if defined?(WIN32OLE_EVENT) end def teardown + File.unlink(@f) @ie.quit @ie = nil GC.start - sleep 1 end end end |