suke	2010-04-16 23:55:42 +0900 (Fri, 16 Apr 2010)

  New Revision: 27360

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27360

  Log:
    * test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
      run test only when "Create Shortcut (&S)" menu is found. 
      [ruby-core:29550] [Bug #1602]

  Modified files:
    trunk/ChangeLog
    trunk/test/win32ole/test_folderitem2_invokeverb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27359)
+++ ChangeLog	(revision 27360)
@@ -1,3 +1,9 @@
+Fri Apr 16 23:42:56 2010  Masaki Suketa <masaki.suketa@n...>
+
+	* test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
+	  run test only when "Create Shortcut (&S)" menu is found. 
+	  [ruby-core:29550] [Bug #1602]
+
 Fri Apr 16 21:52:16 2010  Yusuke Endoh  <mame@t...>
 
 	* parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
Index: test/win32ole/test_folderitem2_invokeverb.rb
===================================================================
--- test/win32ole/test_folderitem2_invokeverb.rb	(revision 27359)
+++ test/win32ole/test_folderitem2_invokeverb.rb	(revision 27360)
@@ -60,19 +60,21 @@
     end
 
     def test_invokeverb
-      links = find_link(@dummy_path)
-      assert(0, links.size)
+      # this test should run only when "Create Shortcut (&S)" 
+      # is found in context menu,
+      if @shortcut
+        links = find_link(@dummy_path)
+        assert(0, links.size)
 
-      assert(@shortcut)
+        # Now create shortcut to @dummy_path
+        arg = WIN32OLE_VARIANT.new(@shortcut)
+        @fi2.InvokeVerb(arg)
 
-      # Now create shortcut to @dummy_path
-      arg = WIN32OLE_VARIANT.new(@shortcut)
-      @fi2.InvokeVerb(arg)
-
-      # Now search shortcut to @dummy_path
-      links = find_link(@dummy_path)
-      assert(1, links.size)
-      @lpath = links[0].path
+        # Now search shortcut to @dummy_path
+        links = find_link(@dummy_path)
+        assert(1, links.size)
+        @lpath = links[0].path
+      end
     end
 
     def teardown

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/