operawatir 0.4-jruby → 0.4.1-jruby

data/lib/operawatir/quickwidgets.rb

@@ -1,3 +1,4 @@
 %w(quick_widget quick_button quick_checkbox quick_editfield 
     quick_dropdown quick_dialogtab quick_label quick_radiobutton quick_treeview quick_addressfield 
-    quick_searchfield quick_toolbar quick_window quick_tab quick_treeitem quick_thumbnail).each {|widget| require "operawatir/quickwidgets/#{widget}"}
+    quick_searchfield quick_toolbar quick_window quick_tab quick_treeitem quick_thumbnail
+    quick_find quick_griditem quick_gridlayout).each {|widget| require "operawatir/quickwidgets/#{widget}"}

data/lib/operawatir/quickwidgets/quick_addressfield.rb

@@ -14,7 +14,11 @@ module OperaWatir
     # @param  [String] URL to load
     # @return [String] text in the address field after the page is loaded
     #                  or a blank string
+    # @raise [Exceptions::UnknownObjectException] if the widget could not be found
+    #           using the specified method
     def load_page_with_url(url)
+      # Must focus field before calling enter_text...
+      focus_with_click
       # Enters text in a field and then hits enter
       enter_text_and_hit_enter(url)
     end
@@ -22,6 +26,10 @@ module OperaWatir
     #
     # Gets the visible text in the address field
     #
+    # @return [String] visible text in address field
+    #
+    # @raise [Exceptions::UnknownObjectException] if the widget could not be found
+    #           using the specified method
     def visible_text
       element.getVisibleText()
     end
@@ -29,6 +37,10 @@ module OperaWatir
     #
     # Gets the highlighted text in the address field
     #
+    # @return [String] higlighted text in address field, if any, else empty
+    #
+    # @raise [Exceptions::UnknownObjectException] if the widget could not be found
+    #           using the specified method
     def highlighted_text
       element.getAdditionalText()     
     end

data/lib/operawatir/quickwidgets/quick_button.rb

@@ -89,7 +89,8 @@ module OperaWatir
     # Clicks a button or expand control and toggles it state
     #
     # @return [int] the new state of the button or expand control,
-    #               0 for not pressed, or 1 for pressed
+    #               0 for not pressed, or 1 for pressed,
+    #               nil if the element does no longer exist
     #
     # @raise [DesktopExceptions::WidgetNotVisibleException] if the button
     #            is not visible
@@ -100,7 +101,12 @@ module OperaWatir
       # Cheat since we don't have an event yet 
       sleep(0.1)
         
-      element(true).getValue
+      # Note: click might have made this element dissapear ...
+      begin
+        element(true).getValue
+      rescue Exceptions::UnknownObjectException
+        nil
+      end
     end
   
     ######################################################################

data/lib/operawatir/quickwidgets/quick_checkbox.rb

@@ -21,7 +21,7 @@ module OperaWatir
     ######################################################################
     # Clicks a radio button or checkbox and toggles it state
     #
-    # @return [int] the new state of the radio button or checkbox,
+    # @return [Boolean] the new state of the radio button or checkbox,
     #               false for not checked, or true for checked
     #
     # @raise [DesktopExceptions::WidgetNotVisibleException] if the checkbox
@@ -33,6 +33,7 @@ module OperaWatir
       # Cheat since we don't have an even yet 
       sleep(0.1)
 
+      # is this guaranteed to be same as getValue?
       element(true).isSelected
     end
 
@@ -49,10 +50,9 @@ module OperaWatir
     #            is not visible
     #
     def open_dialog_with_click(win_name)
-      super
-      #wait_start
-      #click
-      #wait_for_window_shown(win_name)
+      wait_start
+      click
+      wait_for_window_shown(win_name)
     end
 
   end

data/lib/operawatir/quickwidgets/quick_editfield.rb

@@ -20,7 +20,7 @@ module OperaWatir
     ######################################################################
     # Types a text string into the edit field
     #
-    # @note Only chanracters that appear on the keyboard that is currently
+    # @note Only characters that appear on the keyboard that is currently
     #       selected can be typed, and the edit field must have focus.
     #
     # @param [String] text text string to type in
@@ -45,9 +45,9 @@ module OperaWatir
     ######################################################################
     # Clears the contents of the edit field
     #
-    # @note The edit field must have focus for this method to work
-    #
     def clear
+      focus_with_click
+      
       key_press_direct("a", :ctrl)
       key_press_direct("backspace")
       
@@ -96,10 +96,13 @@ module OperaWatir
     def enter_text_and_hit_enter(text)
       loaded_url = ""
       
+      # OBS: only caller should set focus, if not this will happily type 
+      # away in the incorrect field, if for example called from subclass address_field
       # Set focus
-      focus_with_click
+      # focus_with_click
+      
       # Clear the field
-      clear()
+      clear
       # Type in the text
       typed_text = type_text(text) #Opens dropdown window
       # Check that some text was typed, note the text might be changed in the

data/lib/operawatir/quickwidgets/quick_find.rb

@@ -0,0 +1,11 @@
+module OperaWatir
+  class QuickFind < QuickDropdown
+
+    # @private
+    # Checks the type of the widget is correct
+    def correct_type?
+      @element.getType == WIDGET_ENUM_MAP[:quickfind]
+    end
+
+  end
+end

data/lib/operawatir/quickwidgets/quick_griditem.rb

@@ -0,0 +1,11 @@
+module OperaWatir
+  class QuickGridItem < QuickWidget
+
+    # @private
+    # Checks the type of the widget is correct
+    def correct_type?
+      @element.getType == WIDGET_ENUM_MAP[:griditem]
+    end
+
+  end
+end

data/lib/operawatir/quickwidgets/quick_gridlayout.rb

@@ -0,0 +1,11 @@
+module OperaWatir
+  class QuickGridLayout < QuickWidget
+
+    # @private
+    # Checks the type of the widget is correct
+    def correct_type?
+      @element.getType == WIDGET_ENUM_MAP[:gridlayout]
+    end
+
+  end
+end

data/lib/operawatir/quickwidgets/quick_searchfield.rb

@@ -17,8 +17,14 @@ module OperaWatir
     #                   or a blank string
     #
     def search_with_text(search_text)
+      # Must focus field before calling enter_text...
+      focus_with_click
+      
       # Enters text in a field and then hits enter
-      enter_text_and_hit_enter(search_text)
+      t = enter_text_and_hit_enter(search_text)
+
+      # return text in addressfield (in same window as search field)      
+      driver.findWidgetByName(WIDGET_ENUM_MAP[:addressfield], @window_id, "tba_address_field", "Document Toolbar").getText
     end
     
   end

data/lib/operawatir/quickwidgets/quick_tab.rb

@@ -12,7 +12,6 @@ module OperaWatir
     #
     # @param [QuickTab] tab button to drop this tab on
     #
-    #
     # @raise [DesktopExceptions::UnknownObjectException] if the target is not a tab
     #
     def move_with_drag(tab_target)

data/lib/operawatir/quickwidgets/quick_treeitem.rb

@@ -10,8 +10,10 @@ module OperaWatir
     ######################################################################
     # Set focus to the tree item by clicking on it
     #
-    # @raise [DesktopExceptions::WidgetNotVisibleException] if the treeview
+    # @raise [DesktopExceptions::WidgetNotVisibleException] if the treeview 
     #            the treeitem is in is not visible
+    # @raise [DesktopExceptions::WidgetDisabledException] if the treeitem
+    #            is disabled
     #
     def focus_with_click
       # First scroll the item into view
@@ -29,6 +31,8 @@ module OperaWatir
       # For now there is no difference to focusing
       focus_with_click
     end
+    
+    alias_method :collapse_with_click, :expand_with_click
 
     ######################################################################
     # Expands a tree item when it is double clicked
@@ -111,6 +115,23 @@ module OperaWatir
     end
     
     alias_method :open_dialog_with_double_click, :open_window_with_double_click
+
+    ######################################################################
+    # Double clicks the tree item, and waits for the window with 
+    # window name win_name to be loaded with the url of the treeitem
+    #
+    # @param [String] win_name name of the window that will be loaded (Pass a blank string for any window)
+    #
+    # @return [int] Window ID of the window shown or 0 if no window is shown
+    #
+    # @raise [DesktopExceptions::WidgetNotVisibleException] if the treeitem
+    #            is not visible
+    #
+    def load_window_with_double_click(win_name)
+      wait_start
+      click(:left, 2)
+      wait_for_window_loaded(win_name)
+    end
     
 
 private

data/lib/operawatir/quickwidgets/quick_widget.rb

@@ -2,17 +2,20 @@ module OperaWatir
   class QuickWidget
     include DesktopCommon
     include DesktopContainer
+    include Deprecated
     
     # @private
     # window_id is set if constructor is called on a (parent) window
     # location is set is this is called on a (parent) widget
-    def initialize(container, method, selector=nil, location=nil, window_id=-1)
+    def initialize(container, method, selector=nil, location=nil, window_id=-1, type=nil)
       @container = container
                             
       if method.is_a? Java::ComOperaCoreSystems::QuickWidget
         @elm = method
+        @type = WIDGET_ENUM_MAP.invert[method.getType]
       else
         @method    = method
+        @type      = type
         @selector  = selector
         @location  = location
         @window_id  = window_id
@@ -70,8 +73,7 @@ module OperaWatir
     # Gets the text of the widget
     #
     # @note This method should not be used to check the text in a widget if
-    #       the text is in the Opera language file. Use verify_text or
-    #       verify_includes_text instead
+    #       the text is in the Opera language file. Use verify_text instead
     #
     # @return [String] text of the widget
     #
@@ -121,6 +123,7 @@ module OperaWatir
     ######################################################################
     # Checks that the text in the widget matches the text as loaded
     # from the current language file in Opera using the string_id
+    # (Strips &'s from the string before comparing)
     #
     # @param [String] string_id String ID to use to load the string from the current
     #                 language file (e.g. "D_NEW_PREFERENCES_GENERAL")
@@ -131,10 +134,17 @@ module OperaWatir
     #               using the specified method
     #
     def verify_text(string_id)
-      element.verifyText(string_id);
+      text = driver.getString(string_id, true) #true => stripAmpersands from string
+      if text.include? "%"
+        text.gsub!(/%[csduoxefg0-9]/, ".*")
+        res = /#{text}/ =~ element.getText()
+        res == nil ? false: true
+      else
+        element.verifyText(string_id) 
+      end
     end
   
-    alias_method :is_text?, :verify_text
+    alias_method :has_ui_string?, :verify_text
     
     ######################################################################
     # Checks that the text in the widget includes the text as loaded
@@ -153,6 +163,8 @@ module OperaWatir
     end
     
     alias_method :includes_text?, :verify_includes_text
+    deprecated :verify_includes_text
+    deprecated :includes_text?
 
     ######################################################################
     # Prints out all of the row/col information in single lines. Used to
@@ -187,8 +199,35 @@ module OperaWatir
     def position
       return [row, col] if type == :treeitem
       return col if type == :tabbutton
+      return col if type == :button
       false
     end
+
+    ########################################################################
+    #
+    # @return width of widget
+    #
+    def width
+      element.getRect().width
+    end
+
+    ########################################################################
+    #
+    # @return height of widget
+    #
+    def height
+      element.getRect().height
+    end
+
+    #@private
+    def x
+      element.getRect().x
+    end
+
+    #@private
+    def y
+      element.getRect().y
+    end
     
     ######################################################################
     # Prints out all of the internal information about the widget. Used
@@ -244,7 +283,7 @@ module OperaWatir
     def value
       return element.getValue
     end
-
+    
 protected
     #@private
     # Return the element
@@ -256,8 +295,8 @@ protected
       raise(Exceptions::UnknownObjectException, "Element #{@selector} not found using #{@method}") unless @elm 
       @elm
     end
-    
-    
+
+  
 private
     
    def drag_and_drop_on(other, drop_pos)
@@ -303,16 +342,16 @@ private
     
     # Click widget
     def click(button = :left, times = 1, *opts)
-      raise Exceptions::WidgetDisabledException, "Element #{@selector} is disabled" unless enabled?
-      
+      raise DesktopExceptions::WidgetDisabledException, "Element #{@selector} is disabled" unless enabled?
+  
       #Some buttons etc. aren't visible until hovering them
       if (visible? == false and type != :dialogtab)
         element.hover
         element(true)
       end
-      
+  
       # Dialog tabs are always visible even if the page they are connected to isn't
-      if visible? == true or type == :dialogtab 
+      if visible? == true or type == :dialogtab
         button = DesktopEnums::MOUSEBUTTON_ENUM_MAP[button]
         list = Java::JavaUtil::ArrayList.new
         opts.each { |mod| list << DesktopEnums::KEYMODIFIER_ENUM_MAP[mod] }
@@ -321,12 +360,12 @@ private
         raise(DesktopExceptions::WidgetNotVisibleException, "Widget #{name.length > 0 ? name : text} not visible")
       end
     end
-    
+
     # Right click a widget
     def right_click
       click(:right, 1)
     end
-    
+  
     # double click widget
     def double_click
       click(:left, 2) 
@@ -361,31 +400,31 @@ private
       if @selector == nil && @elm != nil
         set_selector
       end
-      #puts "<find> Find Widget by " + @method.to_s + " " + @window_id.to_s + ", " + @selector.to_s + ", " + @location.to_s
+      #puts "\n<find> Find Widget by " + @method.to_s + " " + @window_id.to_s + ", " + @selector.to_s + ", " + @location.to_s + ", " + @type.to_s
       case @method
       when :name
         if @location != nil
-          @element = driver.findWidgetByName(@window_id, @selector, @location)
+          @element = driver.findWidgetByName(WIDGET_ENUM_MAP[@type], @window_id, @selector, @location)
         else
-          @element = driver.findWidgetByName(@window_id, @selector)
+          @element = driver.findWidgetByName(WIDGET_ENUM_MAP[@type], @window_id, @selector)
         end
       when :string_id
         if @location != nil
-          @element = driver.findWidgetByStringId(@window_id, @selector, @location)
+          @element = driver.findWidgetByStringId(WIDGET_ENUM_MAP[@type], @window_id, @selector, @location)
         else
-          @element = driver.findWidgetByStringId(@window_id, @selector)
+          @element = driver.findWidgetByStringId(WIDGET_ENUM_MAP[@type], @window_id, @selector)
         end
       when :text
         if @location != nil
-          @element = driver.findWidgetByText(@window_id, @selector, @location)
+          @element = driver.findWidgetByText(WIDGET_ENUM_MAP[@type], @window_id, @selector, @location)
         else
-          @element = driver.findWidgetByText(@window_id, @selector)
+          @element = driver.findWidgetByText(WIDGET_ENUM_MAP[@type], @window_id, @selector)
         end
       when :pos
         if @location != nil
-          @element = driver.findWidgetByPosition(@window_id, @selector[0], @selector[1], @location)
+          @element = driver.findWidgetByPosition(WIDGET_ENUM_MAP[@type], @window_id, @selector[0], @selector[1], @location)
         else
-          @element = driver.findWidgetByPosition(@window_id, @selector[0], @selector[1])
+          @element = driver.findWidgetByPosition(WIDGET_ENUM_MAP[@type], @window_id, @selector[0], @selector[1])
         end
      end
       if @window_id < 0 && @element != nil

data/lib/operawatir/quickwidgets/quick_window.rb

@@ -32,6 +32,8 @@ module OperaWatir
     #
     # @return [Symbol] type of the window (e.g. :dropdown, :button)
     #
+    # @raise [Exceptions::UnknownObjectException] if the widget could not be found
+    #           using the specified method
     def type
       return WINDOW_ENUM_MAP.invert[@elm.getType] unless @elm == nil
       return WINDOW_ENUM_MAP.invert[element.getType] 
@@ -104,7 +106,33 @@ module OperaWatir
     def print_window_info
       puts window_info_string
     end
+    
+    ########################################################################
+    #
+    # @return width of widget
+    #
+    def width
+      element.getRect().width
+    end
 
+    ########################################################################
+    #
+    # @return height of widget
+    #
+    def height
+      element.getRect().height
+    end
+
+    #@private
+    def x
+      element.getRect().x
+    end
+
+    #@private
+    def y
+      element.getRect().y
+    end
+  
     ######################################################################
     # Returns a string of the internal information about the window. Used
     # to discover the names of widgets and windows to use in the tests.
@@ -149,8 +177,10 @@ private
       case @method
       when :name
         # Use active window when specifying by name "Document Window"
-        # and not the first if there are more than one 
-        if (@selector == "Document Window")
+        # and not the first if there are more than one
+        active_window_id = driver.getActiveQuickWindowID()
+        name = driver.getQuickWindowName(active_window_id);
+        if (@selector == "Document Window" && name == "Document Window")
           @element = driver.findWindowById(driver.getActiveQuickWindowID())
         else
           @element = driver.findWindowByName(@selector)