ext/win32ole/win32ole.c (add_event_call_back): should not

 delete event handler when the event name is not entried.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 0 insertions, 190 deletions

diff --git a/ext/win32ole/tests/testINVOKEVERB.rb b/ext/win32ole/tests/testINVOKEVERB.rb
deleted file mode 100644
index 96b3e2f88f..0000000000
--- a/ext/win32ole/tests/testINVOKEVERB.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# This script check that Win32OLE can execute InvokeVerb method of FolderItem2.
-#
-
-require 'test/unit'
-require 'win32ole'
-
-class TestInvokeVerb < Test::Unit::TestCase
-  def setup
-    #
-    # make dummy.txt file for InvokeVerb test.
-    #
-    ofs = open('dummy.txt', 'w')
-    ofs.write('this is test')
-    ofs.close
-
-    @fso = WIN32OLE.new('Scripting.FileSystemObject')
-    @dummy_path = @fso.GetAbsolutePathName('dummy.txt')
-
-    @shell=WIN32OLE.new('Shell.Application')
-    @fi2 = @shell.NameSpace(@dummy_path).ParentFolder.ParseName(@shell.NameSpace(@dummy_path).Title)
-    @shortcut = nil
-
-    #
-    # Search the 'Create Shortcut (&S)' string.
-    # Yes, I know the string in the Windows 2000 Japanese Edition.
-    # But I do not know about the string in any other Windows.
-    # 
-    verbs = @fi2.verbs
-    verbs.extend(Enumerable)
-    @shortcut = verbs.collect{|verb| 
-      verb.name
-    }.find {|name|
-      /.*\(\&S\)$/ =~ name
-    }
-  end
-
-  def test_invokeverb
-    # We expect there is no shortcut in this folder.
-    link = Dir["*.lnk"].find {|f| true}
-    assert(!link)
-
-    # Now create shortcut to "dummy.txt"
-    assert(@shortcut)
-    arg = WIN32OLE_VARIANT.new(@shortcut)
-    @fi2.InvokeVerb(arg)
-
-    # We expect there is shortcut in this folder
-    link = Dir["*.lnk"].find {|f| true}
-    assert(link)
-
-    # The shortcut is to the "dummy.txt"
-    @lpath = @fso.GetAbsolutePathName(link)
-    linkinfo = @shell.NameSpace(@lpath).Self.GetLink
-    assert_equal(@dummy_path, linkinfo.path)
-  end
-
-  def teardown
-    if @lpath
-      @fso.deleteFile(@lpath)
-    end
-    if @dummy_path
-      @fso.deleteFile(@dummy_path)
-    end
-  end
-
-end
-
diff --git a/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ext/win32ole/tests/testNIL2VTEMPTY.rb
deleted file mode 100644
index 555d35fbf3..0000000000
--- a/ext/win32ole/tests/testNIL2VTEMPTY.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
-# [ruby-talk:137054]
-
-require 'win32ole'
-require 'test/unit'
-
-class TestNIL2VT_EMPTY < Test::Unit::TestCase
-  def setup
-    fs = WIN32OLE.new('Scripting.FileSystemObject')
-    @path = fs.GetFolder(".").path
-  end
-  def test_openSchema
-    con = nil
-    begin
-      con = WIN32OLE.new('ADODB.Connection')
-      con.connectionString = "Provider=MSDASQL;Extended Properties="
-      con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
-      con.open
-    rescue
-      con = nil
-    end
-    if con
-      rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
-      assert(rs)
-    end
-  end
-end
-
diff --git a/ext/win32ole/tests/testOLEEVENT.rb b/ext/win32ole/tests/testOLEEVENT.rb
deleted file mode 100644
index 0901158642..0000000000
--- a/ext/win32ole/tests/testOLEEVENT.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'rubyunit'
-require 'win32ole'
-
-class TestWIN32OLE_EVENT < RUNIT::TestCase
-  def setup
-    @excel = WIN32OLE.new("Excel.Application")
-    @excel.visible = true
-    @event = ""
-    @event2 = ""
-  end
-  def test_on_event
-    book = @excel.workbooks.Add
-    value = ""
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        begin
-          value = arg1.value
-        rescue
-          value = $!.message
-        end
-      }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("OK", value)
-  end
-
-  def handler1
-    @event += "handler1"
-  end
-  def handler2
-    @event += "handler2"
-  end
-
-  def handler3
-    @event += "handler3"
-  end
-
-  def test_on_event2
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        handler1
-      }
-      ev.on_event('SheetChange'){|arg1, arg2| 
-        handler2
-      }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler2", @event)
-  end
-
-  def test_on_event3
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event{ handler1 }
-      ev.on_event{ handler2 }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler2", @event)
-  end
-
-  def test_on_event4
-    book = @excel.workbooks.Add
-    begin
-      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
-      ev.on_event{ handler1 }
-      ev.on_event{ handler2 }
-      ev.on_event('SheetChange'){|arg1, arg2| handler3 }
-      book.Worksheets(1).Range("A1").value = "OK"
-    ensure
-      book.saved = true
-    end
-    assert_equal("handler3", @event)
-  end
-
-  def teardown
-    @excel.quit
-    @excel = nil
-    GC.start
-  end
-end
-
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
index e5dad78684..12e97e3913 100644
--- a/ext/win32ole/tests/testall.rb
+++ b/ext/win32ole/tests/testall.rb
@@ -2,6 +2,3 @@ require 'test/unit'
 require 'win32ole'
 puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
 require "testWIN32OLE"
-require "testOLEEVENT"
-require "testNIL2VTEMPTY"
-require "testINVOKEVERB"