rautomation 0.8.0 → 0.9.0

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

@@ -0,0 +1,21 @@
+module RAutomation
+  module Adapter
+    module MsUia
+      class ValueControl < Control
+        include WaitHelper
+        include Locators
+
+        def value
+          UiaDll::get_control_value(hwnd)
+        end
+
+        def set(value)
+          UiaDll::set_control_value(hwnd, value)
+        end
+
+        alias_method :exists?, :exist?
+      end
+    end
+  end
+end
+

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

@@ -10,17 +10,6 @@ module RAutomation
 
         has_many :controls
 
-        #todo - figure out what this is for and see if MsUia still needs it
-        class << self
-          def oleacc_module_handle
-            @oleacc_module_handle ||= begin
-              oleacc = Functions.load_library "oleacc.dll"
-              Functions.co_initialize nil
-              oleacc
-            end
-          end
-        end
-
         # Locators of the window.
         attr_reader :locators
 
@@ -64,15 +53,8 @@ module RAutomation
 
         # @see RAutomation::Window#class_names
         def class_names
-          root_element = UiaDll::element_from_handle(hwnd)
-
-          root_class = FFI::MemoryPointer.new :char, UiaDll::get_class_name(root_element, nil) + 1
-          UiaDll::get_class_name(root_element, root_class)
-
-          classes = gather_children_classes(root_element)
-          classes = classes.flatten
-          classes.delete("")
-          classes.sort
+          classes = UiaDll::children_class_names(UiaDll::SearchCriteria.from_locator(hwnd, :hwnd => hwnd))
+          classes.delete_if(&:empty?).sort
         end
 
         # @see RAutomation::Window#activate
@@ -178,6 +160,10 @@ module RAutomation
           Button.new(self, locator)
         end
 
+        def value_control(locator)
+          ValueControl.new(self, locator)
+        end
+
         # @see TextField#initialize
         # @see RAutomation::Window#text_field
         def text_field(locator)
@@ -196,94 +182,10 @@ module RAutomation
           Functions.respond_to?(name) ? Functions.send(name, *args) : super
         end
 
-        # MsUia adapter specific API methods
-        def element
-          case
-            when @locators[:focus]
-              uia_control = UiaDll::get_focused_element
-            when @locators[:id]
-              uia_control = UiaDll::find_window(@locators[:id].to_s)
-              raise UnknownElementException, "#{@locators[:id]} does not exist" if uia_control.nil?
-            when @locators[:point]
-              uia_control = UiaDll::element_from_point(@locators[:point][0], @locators[:point][1])
-              raise UnknownElementException, "#{@locators[:point]} does not exist" if uia_control.nil?
-            else
-              hwnd = find_hwnd(locators, window_hwnd) do |hwnd|
-                locators_match?(locators, control_properties(hwnd, locators))
-              end
-              raise UnknownElementException, "Element with #{locators.inspect} does not exist" if (hwnd == 0) or (hwnd == nil)
-              uia_control = UiaDll::element_from_handle(hwnd)
-          end
-          uia_control
-        end
-
-        def new_pid
-          UiaDll::current_process_id(uia_control())
-        end
-
-        def display_tree
-          root_element = UiaDll::element_from_handle(hwnd)
-
-          root_name = FFI::MemoryPointer.new :char, UiaDll::get_name(root_element, nil) + 1
-          UiaDll::get_name(root_element, root_name)
-
-          [root_name.read_string.inspect, gather_children(root_element)]
-        end
-
-        def gather_children(root_element)
-          element_tree = []
-
-          child_count = count_children(root_element)
-          children = FFI::MemoryPointer.new :pointer, child_count
-          UiaDll::find_children(root_element, children)
-
-          children.read_array_of_pointer(child_count).each do |child|
-            child_name = FFI::MemoryPointer.new :char, UiaDll::get_name(child, nil) + 1
-            UiaDll::get_name(child, child_name)
-
-            grandchild_count = count_children(child)
-
-            if grandchild_count > 0
-              element_tree << [child_name.read_string, gather_children(child)]
-            else
-              element_tree << child_name.read_string
-            end
-          end
-
-          element_tree
-        end
-
         def count_children(element)
           UiaDll::find_children(element, nil)
         end
 
-        def gather_children_classes(root_element)
-          element_tree = []
-
-          child_count = count_children(root_element)
-          children = FFI::MemoryPointer.new :pointer, child_count
-          UiaDll::find_children(root_element, children)
-
-          children.read_array_of_pointer(child_count).each do |child|
-            child_name = FFI::MemoryPointer.new :char, UiaDll::get_class_name(child, nil) + 1
-            UiaDll::get_class_name(child, child_name)
-
-            grandchild_count = count_children(child)
-
-            if grandchild_count > 0
-              element_tree << [child_name.read_string, gather_children_classes(child)]
-            else
-              element_tree << child_name.read_string
-            end
-          end
-
-          element_tree
-        end
-
-        def get_focused_element
-          UiaDll::get_focused_element()
-        end
-
         def bounding_rectangle
           window = UiaDll::element_from_handle(hwnd)
 

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

@@ -5,7 +5,6 @@ module RAutomation
       module Functions
         extend FFI::Library
 
-        # TODO once done adapt the path to the DLL (somewhere in the packaged gem)
         ffi_lib 'user32', 'kernel32', 'ole32', File.dirname(__FILE__) + '/../../../../ext/IAccessibleDLL/Release/iaccessibleDll.dll'
         ffi_convention :stdcall
 
@@ -242,28 +241,6 @@ module RAutomation
             string_buffer.read_string
           end
 
-          def control_name(control_hwnd)
-            string_buffer = FFI::MemoryPointer.new :char, 255
-            if (get_control_name(control_hwnd, string_buffer) == Constants::S_OK)
-              string_buffer.read_string
-            else
-              fail "Cannot get name for control with HWND 0x" + control_hwnd.to_s(16)
-            end
-          end
-
-          def retrieve_table_strings_for_row(control_hwnd, row)
-            hModule = load_library("oleacc.dll") # TODO should be done only one time
-
-            strings_ptr = FFI::MemoryPointer.new :pointer
-            columns_ptr = FFI::MemoryPointer.new :pointer
-
-            get_table_row_strings(hModule, control_hwnd, strings_ptr, row, columns_ptr)
-            str_ptr = strings_ptr.read_pointer
-            columns = columns_ptr.read_long
-
-            str_ptr.get_array_of_string(0, columns)
-          end
-
           private
 
           def within_foreground_thread(hwnd)

data/lib/rautomation/adapter/win_32/keys.rb

@@ -4,67 +4,70 @@ module RAutomation
       class Keys
         KEYS = {
           # keycodes from http://msdn.microsoft.com/en-us/library/ms927178.aspx
-          :null         => 0x00,
-          :cancel       => 0x03,
-          :help         => 0x2F,
-          :backspace    => 0x08,
-          :tab          => 0x09,
-          :clear        => 0x0C,
-          :return       => 0x0D,
-          :enter        => 0x0D,
-          :shift        => 0x10,
-          :left_shift   => 0xA0,
-          :control      => 0x11,
-          :left_control => 0xA2,
-          :alt          => 0x12,
-          :left_alt     => 0xA4,
-          :pause        => 0x13,
-          :escape       => 0x1B,
-          :space        => 0x20,
-          :page_up      => 0x21,
-          :page_down    => 0x22,
-          :end          => 0x23,
-          :home         => 0x24,
-          :left         => 0x25,
-          :arrow_left   => 0x25,
-          :up           => 0x26,
-          :arrow_up     => 0x26,
-          :right        => 0x27,
-          :arrow_right  => 0x27,
-          :down         => 0x28,
-          :arrow_down   => 0x28,
-          :insert       => 0x2D,
-          :delete       => 0x2E,
-          :semicolon    => 0x3B,
-          :equals       => 0x3D,
-          :numpad0      => 0x60,
-          :numpad1      => 0x61,
-          :numpad2      => 0x62,
-          :numpad3      => 0x63,
-          :numpad4      => 0x64,
-          :numpad5      => 0x65,
-          :numpad6      => 0x66,
-          :numpad7      => 0x67,
-          :numpad8      => 0x68,
-          :numpad9      => 0x69,
-          :multiply     => 0x6A,
-          :add          => 0x6B,
-          :separator    => 0x6C,
-          :subtract     => 0x6D,
-          :decimal      => 0x6E,
-          :divide       => 0x6F,
-          :f1           => 0x70,
-          :f2           => 0x71,
-          :f3           => 0x72,
-          :f4           => 0x73,
-          :f5           => 0x74,
-          :f6           => 0x75,
-          :f7           => 0x76,
-          :f8           => 0x77,
-          :f9           => 0x78,
-          :f10          => 0x79,
-          :f11          => 0x7A,
-          :f12          => 0x7B,
+          :null          => 0x00,
+          :cancel        => 0x03,
+          :help          => 0x2F,
+          :backspace     => 0x08,
+          :tab           => 0x09,
+          :clear         => 0x0C,
+          :return        => 0x0D,
+          :enter         => 0x0D,
+          :shift         => 0x10,
+          :left_shift    => 0xA0,
+          :control       => 0x11,
+          :left_control  => 0xA2,
+          :alt           => 0x12,
+          :left_alt      => 0xA4,
+          :left_bracket  => 0xDB,
+          :right_bracket => 0xDD,
+          :single_quote  => 0xDE,
+          :pause         => 0x13,
+          :escape        => 0x1B,
+          :space         => 0x20,
+          :page_up       => 0x21,
+          :page_down     => 0x22,
+          :end           => 0x23,
+          :home          => 0x24,
+          :left          => 0x25,
+          :arrow_left    => 0x25,
+          :up            => 0x26,
+          :arrow_up      => 0x26,
+          :right         => 0x27,
+          :arrow_right   => 0x27,
+          :down          => 0x28,
+          :arrow_down    => 0x28,
+          :insert        => 0x2D,
+          :delete        => 0x2E,
+          :semicolon     => 0x3B,
+          :equals        => 0x3D,
+          :numpad0       => 0x60,
+          :numpad1       => 0x61,
+          :numpad2       => 0x62,
+          :numpad3       => 0x63,
+          :numpad4       => 0x64,
+          :numpad5       => 0x65,
+          :numpad6       => 0x66,
+          :numpad7       => 0x67,
+          :numpad8       => 0x68,
+          :numpad9       => 0x69,
+          :multiply      => 0x6A,
+          :add           => 0x6B,
+          :separator     => 0x6C,
+          :subtract      => 0x6D,
+          :decimal       => 0x6E,
+          :divide        => 0x6F,
+          :f1            => 0x70,
+          :f2            => 0x71,
+          :f3            => 0x72,
+          :f4            => 0x73,
+          :f5            => 0x74,
+          :f6            => 0x75,
+          :f7            => 0x76,
+          :f8            => 0x77,
+          :f9            => 0x78,
+          :f10           => 0x79,
+          :f11           => 0x7A,
+          :f12           => 0x7B,
         }            
 
         SPECIAL_KEYS = {

data/rautomation.gemspec

@@ -15,7 +15,12 @@ RAutomation provides:
   s.homepage = %q{http://github.com/jarmo/RAutomation}
   s.summary = %q{Automate windows and their controls through user-friendly API with Ruby}
 
-  s.files         = `git ls-files`.split("\n")
+  ext_binaries = [
+    "ext/IAccessibleDLL/Release/IAccessibleDLL.dll",
+    "ext/UiaDll/Release/UiaDll.dll",
+    "ext/WindowsForms/Release/WindowsForms.exe"
+  ]
+  s.files         = `git ls-files`.split("\n") + ext_binaries
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]  
 

data/spec/adapter/autoit/mouse_spec.rb

@@ -28,7 +28,7 @@ describe "AutoIt::Mouse", :if => SpecHelper.adapter == :autoit do
     window = RAutomation::Window.new(:title => "MainFormWindow")
     window.maximize
 
-    text_field = window.text_field(:index => 1)
+    text_field = window.text_field(:index => 2)
     text_field.set("start string")
     text_field.value.should == "start string"
 

data/spec/adapter/ms_uia/select_list_spec.rb

@@ -98,25 +98,4 @@ describe "MsUia::SelectList", :if => SpecHelper.adapter == :ms_uia do
     select_list.option(:text => "Orange").should be_selected
     label.value.should == "Orange"
   end
-
-#  it "control by focus" do
-#    window      = RAutomation::Window.new(:title => /MainFormWindow/i)
-#
-#    button = window.button(:value => "Reset")
-#    button.set_focus
-#
-#    element = window.get_focused_element
-#    type =button.get_current_control_type(element)
-#    puts "type :#{type}"
-
-#    box1 = another_button.bounding_rectangle
-#        box2 =   button.bounding_rectangle
-#
-#
-#    puts "#{box1}"
-#    puts "#{box2}"
-#
-#    sleep 10
-#    box1.should == box2
-#  end
 end

data/spec/adapter/ms_uia/table_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
+  let(:table) { RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView") }
+
   before :each do
     window = RAutomation::Window.new(:title => "MainFormWindow")
     window.button(:value => "Data Entry Form").click { RAutomation::Window.new(:title => "DataEntryForm").exists? }
   end
 
   it "#table" do
-    table = RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView")
     table.should exist
     
     RAutomation::Window.wait_timeout = 0.1
@@ -18,7 +19,6 @@ describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
 
   it "check for table class" do
     RAutomation::Window.new(:title => "DataEntryForm").table(:id => "deleteItemButton").should_not exist
-    RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView").should exist
   end
 
   it "#strings" do
@@ -28,7 +28,6 @@ describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
   end
 
   it "#strings with nested elements" do
-    table = RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView")
 
     table.strings.should == [
         ["Name", "Date of birth", "State"],
@@ -37,24 +36,27 @@ describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
     ]
   end
 
-  it "#select" do
-    table = RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView")
+  it "#select by index" do
+    table.select(0)
+    table.should_not be_selected(1)
 
     table.select(1)
-    table.should_not be_selected(2)
+    table.should be_selected(1)
+  end
 
-    table.select(2)
-    table.should be_selected(2)
+  it "#select by value" do
+    table.select "John Doe"
+    table.should_not be_selected(1)
+
+    table.select "Anna Doe"
+    table.should be_selected(1)
   end
 
   it "#row_count" do
-    table = RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView")
     table.row_count.should eq(2)
   end
 
   context "#rows" do
-    let(:table) { RAutomation::Window.new(:title => "DataEntryForm").table(:id => "personListView") }
-
     it "has rows" do
       table.rows.size.should eq 2
     end