operawatir 0.4.3.pre1-jruby → 0.5-jruby

data/lib/operawatir/desktop_common.rb

@@ -1,19 +1,61 @@
 module OperaWatir
   # @private
-  # This module is to share functions in the driver between modules so 
+  # This module is to share functions in the driver between modules so
   # should not be in the documentation
   module DesktopCommon
     include DesktopEnums
 
-private
+    private
+    def widgets(window)
+
+       # If window specifies window name, and the active window has this name
+       # use its id to get the widgets,
+       if window.is_a? String
+         active_win_id = driver.getActiveQuickWindowID()
+         active_win_name = driver.getQuickWindowName(active_win_id)
+
+         #If the active window is of same type, then grab that one, not first
+         if active_win_name == window #e.g. Both Document Window
+           window = active_win_id
+         end
+       end
+       driver.getQuickWidgetList(window).map do |java_widget|
+         case java_widget.getType
+           when QuickWidget::WIDGET_ENUM_MAP[:button]
+             QuickButton.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:checkbox]
+             QuickCheckbox.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:dialogtab]
+             QuickDialogTab.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:dropdown]
+             QuickDropdown.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:editfield]
+             QuickEditField.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:label]
+             QuickLabel.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:radiobutton]
+             QuickRadioButton.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:treeview]
+             QuickTreeView.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:treeitem]
+             QuickTreeItem.new(self,java_widget)
+           when QuickWidget::WIDGET_ENUM_MAP[:thumbnail]
+             QuickTreeItem.new(self,java_widget)
+         else
+           QuickWidget.new(self,java_widget)
+         end
+       end.to_a
+     end
+
+
     def opera_desktop_action(action_name, *params)
       data = 0
       data_string = ""
       data_string_param = ""
-      
+
       # Sort the parameters into the variables based
       # on type and order
-      params.each { |param| 
+      params.each { |param|
         if param.is_a? Integer
           data = param
         end
@@ -21,16 +63,16 @@ private
         if param.is_a? String
           if data_string.empty?
             data_string = param
-          elsif 
+          elsif
             data_string_param = param
           end
         end
       }
-      
+
       #puts "data: " + data.to_s
       #puts "data_string: " + data_string
       #puts "data_string_param: " + data_string_param
-      
+
       @driver.operaDesktopAction(action_name, data, data_string, data_string_param)
     end
 
@@ -39,56 +81,69 @@ private
       opts.each { |mod| list << KEYMODIFIER_ENUM_MAP[mod] }
       driver.keyPress(key, list)
     end
-    
-    def key_down(key, *opts)
+
+    def key_down_direct(key, *opts)
       list = Java::JavaUtil::ArrayList.new
       opts.each { |mod| list << KEYMODIFIER_ENUM_MAP[mod] }
       driver.keyDown(key, list)
     end
-    
-    def key_up(key, *opts)
+
+    def key_up_direct(key, *opts)
       list = Java::JavaUtil::ArrayList.new
       opts.each { |mod| list << KEYMODIFIER_ENUM_MAP[mod] }
       driver.keyUp(key, list)
     end
-    
+
    # Private wait functions
     #
     def wait_start
       driver.waitStart()
     end
- 
+
     def wait_for_window_shown(win_name = "")
       driver.waitForWindowShown(win_name)
     end
- 
+
     def wait_for_window_updated(win_name = "")
       driver.waitForWindowUpdated(win_name)
     end
- 
+
     def wait_for_window_activated(win_name = "")
       driver.waitForWindowActivated(win_name)
     end
- 
+
     def wait_for_window_close(win_name = "")
       driver.waitForWindowClose(win_name)
     end
-    
+
     def wait_for_window_loaded(win_name = "")
       win_id = driver.waitForWindowLoaded(win_name)
       # Hack to allow for Javascript focus events and the like
-      # We need to increase this until we have fixed the bug with the 
+      # We need to increase this until we have fixed the bug with the
       # tab title taking extra time to change
       sleep(0.5)
       win_id
     end
-    
+
+    def wait_for_menu_shown(menu_name = "")
+      driver.waitForMenuShown(menu_name)
+    end
+
+    def wait_for_menu_closed(menu_name = "")
+      driver.waitForMenuClosed(menu_name)
+    end
+
+    def wait_for_widget_visible
+      i = 15
+      sleep(0.1) while element(true).isVisible == false and (i -= 1)  > 0
+    end
+
     def wait_for_widget_enabled
       max_timeout = 1.5
       curr_timeout = 0.0
       step = 0.1
-      
-      while curr_timeout < max_timeout  
+
+      while curr_timeout < max_timeout
         if element(true).isEnabled == true
           break
         end
@@ -96,14 +151,24 @@ private
         sleep(step)
         curr_timeout += step
       end
-      
+
       # Check we didn't exceed the timeout
       if curr_timeout >= max_timeout
         return false
       end
-      
+
       # Return true
       true
     end
+
+    def mac_internal?
+        Config::CONFIG['target_os'] == "darwin"
+    end
+
+    def linux_internal?
+       Config::CONFIG['target_os'] == "linux"
+     end
+
+
   end
 end

data/lib/operawatir/desktop_container.rb

@@ -1,6 +1,6 @@
 module OperaWatir
   module DesktopContainer
-    
+
     ######################################################################
     # Method for accessing a button element
     #
@@ -8,20 +8,21 @@ module OperaWatir
     #   browser.quick_button(:name, "button_OK")
     #
     # @param [String] how   Method to find the element. :name, :text or :string_id of the button
-    # @param [String] what  Search text to find the element with. Currently name, text or string_id 
-    #                       of the button 
+    # @param [String] what  Search text to find the element with. Currently name, text or string_id
+    #                       of the button
     #
     # @return [Object] button object if found, otherwise nil
     #
     def quick_button(how, what)
-      if how == :pos
-        if what.is_a? Fixnum
-          what = [0, what]
-        end
-      end
+      what = [0, what] if how == :pos && (what.is_a? Fixnum)
+      #if how == :pos
+      #  if what.is_a? Fixnum
+      #    what = [0, what]
+      #  end
+      #end
       QuickButton.new(self, how, what, parent_widget, window_id, :button)
     end
-    
+
     ######################################################################
     # Method for accessing a tab button element
     #
@@ -43,7 +44,7 @@ module OperaWatir
       end
       QuickTab.new(self, how, what, parent_widget, window_id, :tabbutton)
     end
-       
+
     ######################################################################
     # Method for accessing a checkbox element
     #
@@ -51,7 +52,7 @@ module OperaWatir
     #   browser.quick_checkbox(:name, "Enable_wand_checkbox")
     #
     # @param [String] how   Method to find the element. :name, :text or :string_id
-    # @param [String] what  Search text to find element with. 
+    # @param [String] what  Search text to find element with.
     #
     # @return [Object] checkbox object if found, otherwise nil
     #
@@ -65,8 +66,8 @@ module OperaWatir
     # @example
     #   browser.quick_dialogtab(:name, "tab_prefs_forms")
     #
-    # @param [String] how   Method to find the element. :name, :string_id or :text 
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] how   Method to find the element. :name, :string_id or :text
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] dialog tab object if found, otherwise nil
     #
@@ -81,7 +82,7 @@ module OperaWatir
     #   browser.quick_dropdown(:name, "Startup_mode_dropdown")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] drop down object if found, otherwise nil
     #
@@ -89,6 +90,22 @@ module OperaWatir
       QuickDropdown.new(self, how, what, parent_widget, window_id, :dropdown)
     end
 
+    ######################################################################
+    # Method for accessing a combobox (i.e. dropdown) element
+    #
+    # @example
+    #   browser.quick_dropdown(:name, "Startup_mode_dropdown")
+    #
+    # @param [String] how   Method to find the element. :name, :string_id or :text
+    # @param [String] what  Search text to find the element with.
+    #
+    # @return [Object] drop down object if found, otherwise nil
+    #
+    def quick_dropdownitem(how, what)
+      QuickDropdownItem.new(self, how, what, parent_widget, window_id, :dropdownitem)
+    end
+
+
    ######################################################################
    # Method for accessing a quickfind element
    #
@@ -96,7 +113,7 @@ module OperaWatir
    #   browser.quick_find(:name, "Filetypes_quickfind")
    #
    # @param [String] how   Method to find the element. :name, :string_id or :text
-   # @param [String] what  Search text to find the element with.  
+   # @param [String] what  Search text to find the element with.
    #
    # @return [Object] quickfind object if found, otherwise nil
    #
@@ -111,7 +128,7 @@ module OperaWatir
     #   browser.quick_editfield(:name, "Startpage_edit")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] edit field object if found, otherwise nil
     #
@@ -126,7 +143,7 @@ module OperaWatir
     #   browser.quick_label(:name, "label_for_Popups_dropdown")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] label object if found, otherwise nil
     #
@@ -141,7 +158,7 @@ module OperaWatir
     #   browser.quick_radiobutton(:name, "Accept_cookies_radio")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] radio button object if found, otherwise nil
     #
@@ -156,14 +173,14 @@ module OperaWatir
     #   browser.quick_treeview(:name, "Web_search_treeview")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. 
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] treeview object if found, otherwise nil
     #
     def quick_treeview(how, what)
       QuickTreeView.new(self, how, what, parent_widget, window_id, :treeview)
     end
-    
+
     ######################################################################
     # Method for accessing an addressfield object
     #
@@ -171,14 +188,14 @@ module OperaWatir
     #   browser.quick_toolbar(:name, "Document Toolbar").quick_addressfield(:name, "tba_addressfield")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] addressfield object if found, otherwise nil
     #
     def quick_addressfield(how, what)
         QuickAddressField.new(self, how, what, parent_widget, window_id, :addressfield)
     end
-        
+
     ######################################################################
     # Method for accessing a searchfield element
     #
@@ -186,14 +203,14 @@ module OperaWatir
     #   browser.quick_searchfield(:name, "Web_search_searchfield")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. 
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] searchfield object if found, otherwise nil
     #
     def quick_searchfield(how, what)
       QuickSearchField.new(self, how, what, parent_widget, window_id, :search)
     end
-    
+
     ######################################################################
     # Method for accessing a toolbar element
     #
@@ -201,14 +218,14 @@ module OperaWatir
     #   browser.quick_toolbar(:name, "Document_toolbar")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with.  
+    # @param [String] what  Search text to find the element with.
     #
     # @return [Object] toolbar object if found, otherwise nil
     #
     def quick_toolbar(how, what)
       QuickToolbar.new(self, how, what, parent_widget, window_id, :toolbar)
     end
-    
+
     ######################################################################
     # Method for accessing a tree item in a treeview
     #
@@ -216,7 +233,7 @@ module OperaWatir
     #   browser.quick_treeview(:name, "Server_treeview").quick_treeitem(:pos, [2,0])
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. Text or position 
+    # @param [String] what  Search text to find the element with. Text or position
     #                        of treeitem. Position is specified as [row, column]
     #
     # @return [Object] treeitem object if found, otherwise nil
@@ -232,7 +249,7 @@ module OperaWatir
     #   browser.quick_gridlayout(:name, "RulesGrid").quick_griditem(:name, "GridItem0").quick_editfield(:name, "Match")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. Text or position 
+    # @param [String] what  Search text to find the element with. Text or position
     #                        of treeitem. Position is specified as [row, column]
     #
     # @return [Object] griditem object if found, otherwise nil
@@ -242,14 +259,14 @@ module OperaWatir
     end
 
     ######################################################################
-    # Method for accessing a grid layout 
-    # (A grid layout would normally be used to specify the path to a child item in one of its cells. 
+    # Method for accessing a grid layout
+    # (A grid layout would normally be used to specify the path to a child item in one of its cells.
     #
     # @example (The label dialog for mail labels)
     #   browser.quick_gridlayout(:name, "RulesGrid").quick_griditem(:name, "GridItem0").quick_editfield(:name, "Match")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. Text or position 
+    # @param [String] what  Search text to find the element with. Text or position
     #                        of treeitem. Position is specified as [row, column]
     #
     # @return [Object] gridlayout object if found, otherwise nil
@@ -258,7 +275,7 @@ module OperaWatir
        QuickGridLayout.new(self, how, what, parent_widget, window_id, :gridlayout)
      end
 
-     
+
     ######################################################################
     # Method for accessing a thumbnail (speeddial, thumbnail when  hovering tab groups)
     #
@@ -267,7 +284,7 @@ module OperaWatir
     #   browser.quick_thumbnail(:name, "Speed Dial 2")
     #
     # @param [String] how   Method to find the element. :name, :string_id or :text
-    # @param [String] what  Search text to find the element with. Text or position 
+    # @param [String] what  Search text to find the element with. Text or position
     #                        of treeitem. Position is specified as [row, column]
     #
     # @return [Object] thumbnail object if found, otherwise nil
@@ -292,7 +309,7 @@ module OperaWatir
     # @param [String] how   Method to find the element. Currently only :name is supported
     # @param [String] what  or [int] window_id Search text to find the element with. Name of window
     #                       or the windows window_id
-    #                         
+    #
     #
     # @return [Object] window object if found, otherwise nil
     #
@@ -300,6 +317,58 @@ module OperaWatir
       QuickWindow.new(self, how, what)
     end
 
+    ##########################################################################
+    # Method for accessing a menu
+    #
+    # @example
+    #    browser.quick_menu(:name, "Main Menu")
+    #
+    # @param [String] how Method to find the element. Supported: :name
+    # @param [String] what Search text to find the element with.
+    #
+    def quick_menu(how, what)
+      if mac_internal?
+        QuickMenu.new(self, how, what, nil)
+      else
+        QuickMenu.new(self, how, what, window_id)
+      end
+    end
+
+    #############################################################################
+    # Method for accessing a menuitem
+    #
+    # @example
+    #     browser.quick_menu(:name, "Main Menu").quick_menuitem(:submenu, "Browser Tools Menu")
+    #     browser.quick_menuitem(:name, "Browser File Menu")
+    #     browser.quick_menuitem(:action, "Open page")
+    #     browser.quick_menuitem(:name, "Open link, vg.no")
+    #     browser.quick_menuitem(:string_id, "SOME_STRING_ID")
+    #     browser.quick_menu(:name, "Main Menu").quick_menuitem(:acckey, "b")
+    #     browser.quick_menu(:name, "Edit Item Popup Menu").quick_menuitem(:pos, 2)
+    #
+    #
+    # @param [String] how Method to find the element. Supported: name, text, string_id, action
+    #                      submenu, pos, acckey, shortcut.
+    #                      The item name is:
+    #                      - if the item has an action, the action
+    #                      - if the item has an action with a parameter; "<action>, <actionparameter>"
+    #                      - else if the item opens a submenu, the submenuname
+    #
+    #                     An acckey and pos are unique only within a given menu, so in this case
+    #                     the accesspath to specify the item should include the menu
+    #
+    #
+    #                     Note that only methods that identify a unique item gives a predictable result
+    # @param [String] what Search text to find element with
+    #
+    def quick_menuitem(how, what)
+      if mac_internal? || (window_id != nil && window_id <= 0)
+          QuickMenuItem.new(self, how, what, name == 'Opera' ? nil : name)
+      else
+        QuickMenuItem.new(self, how, what, window_id)
+      end
+    end
+
   end
 end