1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
suke 2007-02-08 13:00:06 +00:00
parent eb64061a38
commit dd4d9d63f0
3 changed files with 31 additions and 12 deletions

View file

@ -1,3 +1,10 @@
Thu Feb 8 21:35:16 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* 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 <ko1@atdot.net> Thu Feb 8 21:02:07 2007 Koichi Sasada <ko1@atdot.net>
* thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION(). * thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION().

View file

@ -9,7 +9,7 @@ if defined?(WIN32OLE)
def setup def setup
begin begin
@sapi = WIN32OLE.new('SAPI.SpVoice') @sapi = WIN32OLE.new('SAPI.SpVoice')
rescue WIN32OLERuntimeErro rescue WIN32OLERuntimeError
@sapi = nil @sapi = nil
end end
end end

View file

@ -6,12 +6,24 @@ require 'test/unit'
if defined?(WIN32OLE_EVENT) if defined?(WIN32OLE_EVENT)
class TestWIN32OLE_EVENT < Test::Unit::TestCase 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 def setup
@ie = WIN32OLE.new("InternetExplorer.Application") @ie = WIN32OLE.new("InternetExplorer.Application")
@ie.visible = true @ie.visible = true
@event = "" @event = ""
@event2 = "" @event2 = ""
@event3 = "" @event3 = ""
@f = create_temp_html
end end
def default_handler(event, *args) def default_handler(event, *args)
@ -21,9 +33,9 @@ if defined?(WIN32OLE_EVENT)
def test_on_event def test_on_event
ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
ev.on_event {|*args| default_handler(*args)} ev.on_event {|*args| default_handler(*args)}
@ie.gohome @ie.navigate("file:///#{@f}")
while @ie.busy while @ie.busy
WIN32OLE_EVENT.message_loop sleep 0.1
end end
assert_match(/BeforeNavigate/, @event) assert_match(/BeforeNavigate/, @event)
assert_match(/NavigateComplete/, @event) assert_match(/NavigateComplete/, @event)
@ -33,9 +45,9 @@ if defined?(WIN32OLE_EVENT)
ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
ev.on_event('BeforeNavigate') {|*args| handler1} ev.on_event('BeforeNavigate') {|*args| handler1}
ev.on_event('BeforeNavigate') {|*args| handler2} ev.on_event('BeforeNavigate') {|*args| handler2}
@ie.gohome @ie.navigate("file:///#{@f}")
while @ie.busy while @ie.busy
WIN32OLE_EVENT.message_loop sleep 0.1
end end
assert_equal("handler2", @event2) assert_equal("handler2", @event2)
end end
@ -44,9 +56,9 @@ if defined?(WIN32OLE_EVENT)
ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
ev.on_event {|*args| handler1} ev.on_event {|*args| handler1}
ev.on_event {|*args| handler2} ev.on_event {|*args| handler2}
@ie.gohome @ie.navigate("file:///#{@f}")
while @ie.busy while @ie.busy
WIN32OLE_EVENT.message_loop sleep 0.1
end end
assert_equal("handler2", @event2) assert_equal("handler2", @event2)
end end
@ -56,9 +68,9 @@ if defined?(WIN32OLE_EVENT)
ev.on_event{|*args| handler1} ev.on_event{|*args| handler1}
ev.on_event{|*args| handler2} ev.on_event{|*args| handler2}
ev.on_event('NavigateComplete'){|*args| handler3(*args)} ev.on_event('NavigateComplete'){|*args| handler3(*args)}
@ie.gohome @ie.navigate("file:///#{@f}")
while @ie.busy while @ie.busy
WIN32OLE_EVENT.message_loop sleep 0.1
end end
assert(@event3!="") assert(@event3!="")
assert("handler2", @event2) assert("handler2", @event2)
@ -68,9 +80,9 @@ if defined?(WIN32OLE_EVENT)
ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
ev.on_event {|*args| default_handler(*args)} ev.on_event {|*args| default_handler(*args)}
ev.on_event('NavigateComplete'){|*args| handler3(*args)} ev.on_event('NavigateComplete'){|*args| handler3(*args)}
@ie.gohome @ie.navigate("file:///#{@f}")
while @ie.busy while @ie.busy
WIN32OLE_EVENT.message_loop sleep 0.1
end end
assert_match(/BeforeNavigate/, @event) assert_match(/BeforeNavigate/, @event)
assert(/NavigateComplete/ !~ @event) assert(/NavigateComplete/ !~ @event)
@ -90,10 +102,10 @@ if defined?(WIN32OLE_EVENT)
end end
def teardown def teardown
File.unlink(@f)
@ie.quit @ie.quit
@ie = nil @ie = nil
GC.start GC.start
sleep 1
end end
end end
end end