rautomation 0.9.0 → 0.9.1

data/lib/rautomation/adapter/ms_uia/button.rb

@@ -8,17 +8,12 @@ module RAutomation
         # Default locators used for searching buttons.
         DEFAULT_LOCATORS = {:class => /button/i}
 
-        #todo - replace with UIA version
-        # @see RAutomation::Button#value
-        def value
-          Functions.control_value(Functions.control_hwnd(@window.hwnd, @locators))
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_BUTTON_CONTROL_TYPE)
         end
 
         alias_method :exists?, :exist?
+        alias_method :value, :control_name
 
       end
     end

data/lib/rautomation/adapter/ms_uia/button_helper.rb

@@ -3,12 +3,6 @@ module RAutomation
     module MsUia
       module ButtonHelper
 
-        #todo - replace with UIA version
-        def set?
-          control_hwnd = Functions.control_hwnd(@window.hwnd, @locators)
-          Functions.control_set? control_hwnd
-        end
-
         # @todo call a windows function to do this without clicking
         def clear
           click {!set?} if set?

data/lib/rautomation/adapter/ms_uia/control.rb

@@ -40,8 +40,7 @@ module RAutomation
           wait_until do
             @window.activate
             @window.active? &&
-                Functions.set_control_focus(hwnd) &&
-                Functions.control_click(hwnd) &&
+                UiaDll::control_click(search_information) &&
                 clicked = true # is clicked at least once
 
             block_given? ? yield : clicked && !exist?
@@ -57,23 +56,21 @@ module RAutomation
         end
 
         def enabled?
-          !disabled?
+          UiaDll::is_enabled(search_information)
         end
 
-        #todo - replace with UIA version
         def disabled?
-          Functions.unavailable?(hwnd)
+          !enabled?
         end
 
         #todo - replace with UIA version
         def focused?
-          Functions.has_focus?(hwnd)
+          UiaDll::is_focused(search_information)
         end
 
         def focus
           assert_enabled
-          uia_control = UiaDll::element_from_handle(hwnd)
-          UiaDll::set_focus(uia_control)
+          UiaDll::set_focus(search_information)
         end
 
         def bounding_rectangle
@@ -123,13 +120,13 @@ module RAutomation
         end
 
         def expand(which_item)
-          UiaDll::expand_by_value hwnd, which_item if which_item.is_a? String
-          UiaDll::expand_by_index hwnd, which_item if which_item.is_a? Integer
+          UiaDll::expand_by_value search_information, which_item if which_item.is_a? String
+          UiaDll::expand_by_index search_information, which_item if which_item.is_a? Integer
         end
 
         def collapse(which_item)
-          UiaDll::collapse_by_value hwnd, which_item if which_item.is_a? String
-          UiaDll::collapse_by_index hwnd, which_item if which_item.is_a? Integer
+          UiaDll::collapse_by_value search_information, which_item if which_item.is_a? String
+          UiaDll::collapse_by_index search_information, which_item if which_item.is_a? Integer
         end
 
       end

data/lib/rautomation/adapter/ms_uia/functions.rb

@@ -208,22 +208,6 @@ module RAutomation
             end
           end
 
-          def set_control_text(control_hwnd, text)
-            send_message(control_hwnd, Constants::WM_SETTEXT, 0, text)
-          end
-
-          def control_set?(control_hwnd)
-            get_button_state(control_hwnd) & Constants::STATE_SYSTEM_CHECKED != 0
-          end
-
-          def has_focus?(control_hwnd)
-            get_button_state(control_hwnd) & Constants::STATE_SYSTEM_FOCUSED != 0
-          end
-
-          def unavailable?(control_hwnd)
-            get_button_state(control_hwnd) & Constants::STATE_SYSTEM_UNAVAILABLE != 0
-          end
-
           def retrieve_combobox_item_text(control_hwnd, item_no)
             text_len = 1024
             string_buffer = FFI::MemoryPointer.new :char, text_len

data/lib/rautomation/adapter/ms_uia/label.rb

@@ -5,16 +5,12 @@ module RAutomation
         include WaitHelper
         include Locators
 
-        #todo - replace with UIA version
-        def value
-          Functions.control_value(Functions.control_hwnd(@window.hwnd, @locators))
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_TEXT_CONTROL_TYPE)
         end
 
         alias_method :exists?, :exist?
+        alias_method :value, :control_name
 
       end
     end

data/lib/rautomation/adapter/ms_uia/list_box.rb

@@ -17,7 +17,7 @@ module RAutomation
         end
 
         def strings
-          items.collect { |item| item.value}
+          UiaDll::find_table_values(search_information)
         end
 
         def value
@@ -31,37 +31,14 @@ module RAutomation
         alias_method :exists?, :exist?
 
         def selected?(index)
-          if items[index]
-            return items[index].selected?
-          end
-
-          false
+          item = items[index]
+          return item && item.selected?
         end
 
         def select(index)
           UiaDll::select_list_select_index search_information, index
         end
 
-        def list_boundary
-          boundary = FFI::MemoryPointer.new :long, 4
-
-          Functions.send_message(hwnd, Constants::LB_GETITEMRECT, 0 ,boundary)
-
-          boundary.read_array_of_long(4)
-        end
-
-        def get_top_index
-          Functions.send_message(hwnd, Constants::LB_GETTOPINDEX, 0 ,nil)
-        end
-
-        def list_item_height
-          Functions.send_message(hwnd, Constants::LB_GETITEMHEIGHT, 0 ,nil)
-        end
-
-        def scroll_to_item(row)
-          Functions.send_message(hwnd, Constants::LB_SETTOPINDEX, row ,nil)
-        end
-
       end
     end
   end

data/lib/rautomation/adapter/ms_uia/select_list.rb

@@ -7,7 +7,7 @@ module RAutomation
         include Locators
 
         class SelectListOption
-          attr_accessor :text, :index, :control_hwnd
+          attr_accessor :text, :index
 
           def initialize(select_list, text, index)
             @select_list = select_list
@@ -16,7 +16,7 @@ module RAutomation
           end
 
           def selected?
-            @index == UiaDll::select_list_selected_index(@select_list.control_hwnd)
+            @index == UiaDll::select_list_selected_index(@select_list.search_information)
           end
 
           def select
@@ -27,11 +27,6 @@ module RAutomation
           alias_method :set, :select
         end
 
-        def initialize(window, locators)
-          super
-          @hwnd = Functions.control_hwnd(@window.hwnd, @locators)
-        end
-
         def set(value)
           UiaDll::select_list_select_value(search_information, value)
         end
@@ -39,9 +34,8 @@ module RAutomation
         def options(options = {})
           items = []
 
-          item_count.times do |item_no|
-            item = Functions.retrieve_combobox_item_text(@hwnd, item_no)
-
+          select_options = UiaDll::select_options(search_information)
+          select_options.each_with_index do |item, item_no|
             if options[:text]
               items.push(SelectListOption.new(self, item, item_no)) if options[:text] == item
             else
@@ -53,47 +47,21 @@ module RAutomation
         end
 
         def value
-          selected_option = options.find { |option| option.selected? }
-          selected_option ? selected_option.text : ""
+          UiaDll::selection(search_information)
         end
 
         def option(options)
-          item_count.times do |item_no|
-            item = Functions.retrieve_combobox_item_text(@hwnd, item_no)
+          UiaDll::select_options(search_information).each_with_index do |item, item_no|
             return SelectListOption.new(self, item, item_no) if options[:text] == item
           end
 
           nil
         end
 
-        def control_hwnd
-          @hwnd
-        end
-
         def select(index)
           UiaDll::select_list_select_index search_information, index
         end
 
-        def list_item_height
-          Functions.send_message(@hwnd, Constants::CB_GETITEMHEIGHT, 0 ,nil)
-        end
-
-        def dropbox_boundary
-          boundary = FFI::MemoryPointer.new :long, 4
-
-          Functions.send_message(@hwnd, Constants::CB_GETDROPPEDCONTROLRECT, 0 ,boundary)
-
-          boundary.read_array_of_long(4)
-        end
-
-        def get_top_index
-          Functions.send_message(@hwnd, Constants::CB_GETTOPINDEX, 0 ,nil)
-        end
-
-        def scroll_to_item(row)
-          Functions.send_message(@hwnd, Constants::CB_SETTOPINDEX , row ,nil)
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_COMBOBOX_CONTROL_TYPE)
         end

data/lib/rautomation/adapter/ms_uia/table.rb

@@ -3,21 +3,21 @@ module RAutomation
     module MsUia
       class Cell
         include Locators
-        attr_reader :row, :column, :hwnd
+        attr_reader :row, :column, :search_information
 
         def initialize(window, locators)
-          @hwnd = window.hwnd
+          @search_information = window.search_information
           @locators = extract(locators)
           @row = window.row
           @column = @locators[:index] || 0
         end
 
         def exists?
-          UiaDll::table_coordinate_valid? hwnd, row, column
+          UiaDll::table_coordinate_valid? search_information, row, column
         end
 
         def value
-          UiaDll::table_value_at hwnd, row, column
+          UiaDll::table_value_at search_information, row, column
         end
 
         alias_method :text, :value
@@ -27,7 +27,7 @@ module RAutomation
       class Row
         include Locators
         extend ElementCollections
-        attr_reader :hwnd
+        attr_reader :search_information
 
         has_many :cells
 
@@ -42,7 +42,7 @@ module RAutomation
         end
 
         def initialize(window, locators)
-          @hwnd = window.hwnd
+          @search_information = window.search_information
           @locators = extract(locators)
         end
 
@@ -51,11 +51,11 @@ module RAutomation
         end
 
         def value
-          UiaDll::table_value_at @hwnd, @locators[:index]
+          UiaDll::table_value_at search_information, @locators[:index]
         end
 
         def exists?
-          UiaDll::table_coordinate_valid?(@hwnd, @locators[:index])
+          UiaDll::table_coordinate_valid?(search_information, @locators[:index])
         end
 
         def self.locators_match?(locators, item)
@@ -87,8 +87,8 @@ module RAutomation
         end
 
         def strings
-          headers = UiaDll.table_headers(hwnd)
-          values = UiaDll.table_values(hwnd)
+          headers = UiaDll.table_headers(search_information)
+          values = UiaDll.table_values(search_information)
           return values if headers.empty?
 
           all_strings = [] << headers
@@ -97,15 +97,15 @@ module RAutomation
         end
 
         def select(which_item)
-          UiaDll::table_select hwnd, which_item
+          UiaDll::table_select search_information, which_item
         end
 
         def selected?(which_item)
-          UiaDll::table_row_is_selected hwnd, which_item
+          UiaDll::table_row_is_selected search_information, which_item
         end
 
         def row_count
-          UiaDll::table_row_count hwnd
+          UiaDll::table_row_count search_information
         end
 
         def exist?
@@ -117,13 +117,6 @@ module RAutomation
         end
 
         alias_method :exists?, :exist?
-
-        private
-
-        def count_children(element)
-          UiaDll::find_children(element, nil)
-        end
-
       end
     end
   end

data/lib/rautomation/adapter/ms_uia/text_field.rb

@@ -12,15 +12,7 @@ module RAutomation
         # @see RAutomation::TextField#set
         def set(text)
           raise "Cannot set value on a disabled text field" if disabled?
-
-          wait_until do
-            hwnd = Functions.control_hwnd(@window.hwnd, @locators)
-            @window.activate
-            @window.active? &&
-                    Functions.set_control_focus(hwnd) &&
-                    Functions.set_control_text(hwnd, text) &&
-                    value == text
-          end
+          UiaDll::set_control_value(search_information, text)
         end
 
         # @see RAutomation::TextField#clear
@@ -32,13 +24,7 @@ module RAutomation
         #todo - replace with UIA version
         # @see RAutomation::TextField#value
         def value
-          Functions.control_value(hwnd)
-        end
-
-        #todo - replace with UIA version
-        # @see RAutomation::TextField#hwnd
-        def hwnd
-          Functions.control_hwnd(@window.hwnd, @locators)
+          UiaDll::get_control_value(search_information)
         end
 
         def exist?

data/lib/rautomation/adapter/ms_uia/uia_dll.rb

@@ -104,12 +104,15 @@ module RAutomation
         # Generic Control methods
         attach_function :ElementExists, [SearchCriteria.by_ref], :bool
         attach_function :process_id, :ProcessId, [SearchCriteria.by_ref], :int
-        attach_function :Control_GetValue, [:long, :pointer, :int], :void
-        attach_function :set_control_value, :Control_SetValue, [:long, :string], :void
+        attach_function :Control_GetValue, [SearchCriteria.by_ref, :pointer, :int], :void
+        attach_function :set_control_value, :Control_SetValue, [SearchCriteria.by_ref, :string], :void
         attach_function :BoundingRectangle, [SearchCriteria.by_ref, :pointer], :int
         attach_function :current_control_type, :ControlType, [SearchCriteria.by_ref], :int
         attach_function :Name, [SearchCriteria.by_ref, :pointer, :int], :void
         attach_function :ClassName, [SearchCriteria.by_ref, :pointer, :int], :void
+        attach_function :is_enabled, :IsEnabled, [SearchCriteria.by_ref], :bool
+        attach_function :is_focused, :IsFocused, [SearchCriteria.by_ref], :bool
+        attach_function :set_focus, :SetControlFocus, [SearchCriteria.by_ref], :bool
         attach_function :GetClassNames,
                         [SearchCriteria.by_ref, :pointer], :int
 
@@ -123,8 +126,8 @@ module RAutomation
           boundary.read_array_of_long(4)
         end
 
-        def self.get_control_value(hwnd)
-          string_from(:Control_GetValue, hwnd)
+        def self.get_control_value(search_information)
+          string_from(:Control_GetValue, search_information)
         end
 
         def self.name(search_information)
@@ -148,17 +151,23 @@ module RAutomation
         # Select List methods
         attach_function :SelectList_Selection,
                         [SearchCriteria.by_ref, :pointer, :int], :void
+        attach_function :SelectList_Options,
+                        [SearchCriteria.by_ref, :pointer], :int
         attach_function :select_list_count, :SelectList_Count,
                         [SearchCriteria.by_ref], :int
         attach_function :select_list_selected_index, :SelectList_SelectedIndex,
-                        [:long], :int
+                        [SearchCriteria.by_ref], :int
         attach_function :select_list_value_at, :SelectList_ValueAt,
-                        [:long, :int, :pointer, :int], :bool
+                        [SearchCriteria.by_ref, :int, :pointer, :int], :bool
         attach_function :select_list_select_index, :SelectList_SelectIndex,
                         [SearchCriteria.by_ref, :int], :bool
         attach_function :select_list_select_value, :SelectList_SelectValue,
                         [SearchCriteria.by_ref, :pointer], :int
 
+        def self.select_options(search_information)
+          strings_from(:SelectList_Options, search_information)
+        end
+
         def self.selection(search_information)
           string_from(:SelectList_Selection, search_information)
         end
@@ -171,47 +180,47 @@ module RAutomation
 
         # Table methods
         attach_function :Table_GetHeaders,
-                        [:long, :pointer], :int
+                        [SearchCriteria.by_ref, :pointer], :int
         attach_function :Table_GetValues,
-                        [:long, :pointer], :int
+                        [SearchCriteria.by_ref, :pointer], :int
         attach_function :Table_FindValues,
                         [SearchCriteria.by_ref, :pointer], :int
         attach_function :table_row_count, :Table_RowCount,
-                        [:long], :int
+                        [SearchCriteria.by_ref], :int
         attach_function :Table_CoordinateIsValid,
-                        [:long, :int, :int], :bool
+                        [SearchCriteria.by_ref, :int, :int], :bool
         attach_function :Table_ValueAt,
-                        [:long, :int, :int, :pointer, :int], :void
+                        [SearchCriteria.by_ref, :int, :int, :pointer, :int], :void
         attach_function :Table_SelectByIndex,
-                        [:long, :int], :void
+                        [SearchCriteria.by_ref, :int], :void
         attach_function :Table_SelectByValue,
-                        [:long, :string], :void
+                        [SearchCriteria.by_ref, :string], :void
         attach_function :table_row_is_selected, :Table_IsSelectedByIndex,
-                        [:long, :int], :bool
+                        [SearchCriteria.by_ref, :int], :bool
 
-        def self.table_select(hwnd, which_item)
+        def self.table_select(search_information, which_item)
           case which_item
             when Integer
-              Table_SelectByIndex hwnd, which_item
+              Table_SelectByIndex search_information, which_item
             when String
-              Table_SelectByValue hwnd, which_item
+              Table_SelectByValue search_information, which_item
           end
         end
 
-        def self.table_value_at(hwnd, row, column=0)
-          string_from(:Table_ValueAt, hwnd, row, column)
+        def self.table_value_at(search_information, row, column=0)
+          string_from(:Table_ValueAt, search_information, row, column)
         end
 
-        def self.table_coordinate_valid?(hwnd, row, column=0)
-          Table_CoordinateIsValid hwnd, row, column
+        def self.table_coordinate_valid?(search_information, row, column=0)
+          Table_CoordinateIsValid search_information, row, column
         end
 
-        def self.table_headers(hwnd)
-          strings_from :Table_GetHeaders, hwnd
+        def self.table_headers(search_information)
+          strings_from :Table_GetHeaders, search_information
         end
 
-        def self.table_values(hwnd)
-          strings_from :Table_GetValues, hwnd
+        def self.table_values(search_information)
+          strings_from :Table_GetValues, search_information
         end
 
         def self.find_table_values(search_information)
@@ -230,8 +239,6 @@ module RAutomation
                         [:pointer, :string], :pointer
         attach_function :current_native_window_handle, :RA_CurrentNativeWindowHandle,
                         [:pointer], :long
-        attach_function :set_focus, :RA_SetFocus,
-                        [:pointer], :bool
         attach_function :move_mouse, :RA_MoveMouse,
                         [:int,:int], :long
         attach_function :click_mouse, :RA_ClickMouse,
@@ -245,18 +252,22 @@ module RAutomation
         attach_function :select, :RA_Select,
                         [:pointer], :int
         attach_function :expand_by_value, :RA_ExpandItemByValue,
-                        [:long, :string], :void
+                        [SearchCriteria.by_ref, :string], :void
         attach_function :expand_by_index, :RA_ExpandItemByIndex,
-                        [:long, :int], :void
+                        [SearchCriteria.by_ref, :int], :void
         attach_function :collapse_by_value, :RA_CollapseItemByValue,
-                        [:long, :string], :void
+                        [SearchCriteria.by_ref, :string], :void
         attach_function :collapse_by_index, :RA_CollapseItemByIndex,
-                        [:long, :int], :void
-        attach_function :control_click, :RA_Click,
-                        [:long, :pointer, :int], :void
+                        [SearchCriteria.by_ref, :int], :void
+        attach_function :RA_Click,
+                        [SearchCriteria.by_ref, :pointer, :int], :void
         attach_function :control_mouse_click, :RA_PointAndClick,
                         [:long, :pointer, :int], :void
 
+        def self.control_click(search_information)
+          can_throw(:RA_Click, search_information)
+        end
+
         private
         def self.strings_from(method, hwnd)
           string_count = send method, hwnd, nil
@@ -272,6 +283,14 @@ module RAutomation
           send method, *(args << pointer << 1024)
           pointer.read_string
         end
+
+        def self.can_throw(method, *args)
+          string_buffer = FFI::MemoryPointer.new :char, 1024
+          send method, *(args << string_buffer << 1024)
+          error_info = string_buffer.read_string
+          raise error_info unless error_info.empty?
+          true
+        end
       end
     end
   end