rautomation 0.10.0 → 0.11.0

data/ext/WindowsForms/WindowsForms/WindowsForms.csproj

@@ -47,6 +47,10 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="UIA.Extensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\UIA.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="UIAutomationClient" />
     <Reference Include="UIAutomationProvider" />
     <Reference Include="UIAutomationTypes" />
@@ -59,10 +63,6 @@
     <Compile Include="AboutBox.Designer.cs">
       <DependentUpon>AboutBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="AutomatableMonthCalendar.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="AutomationHelpers\AutomationProvider.cs" />
     <Compile Include="DataEntryForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -95,6 +95,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ValueMonthCalendar.cs" />
     <EmbeddedResource Include="AboutBox.resx">
       <DependentUpon>AboutBox.cs</DependentUpon>
     </EmbeddedResource>

data/lib/rautomation/adapter/ms_uia.rb

@@ -19,6 +19,7 @@ require File.dirname(__FILE__) + "/ms_uia/menu"
 require File.dirname(__FILE__) + "/ms_uia/radio"
 require File.dirname(__FILE__) + "/ms_uia/text_field"
 require File.dirname(__FILE__) + "/ms_uia/select_list"
+require File.dirname(__FILE__) + "/ms_uia/spinner"
 require File.dirname(__FILE__) + "/ms_uia/table"
 require File.dirname(__FILE__) + "/ms_uia/tab_control"
 require File.dirname(__FILE__) + "/ms_uia/label"

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

@@ -85,19 +85,7 @@ module RAutomation
         end
 
         def visible?
-          element = UiaDll::element_from_handle(hwnd)
-
-          off_screen = FFI::MemoryPointer.new :int
-
-          if UiaDll::is_offscreen(element, off_screen) == 0
-            fail "Could not check element"
-          end
-
-#          puts "return #{off_screen.read_int}"
-          if off_screen.read_int == 0
-            return true
-          end
-          false
+          !UiaDll::is_offscreen(search_information)
         end
 
         def matches_type?(*classes)

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

@@ -172,8 +172,7 @@ module RAutomation
                 raise UnknownElementException, "#{locators[:id]} does not exist" if hwnd == 0
                 hwnd
               when locators[:point]
-                uia_control = UiaDll::element_from_point(locators[:point][0], locators[:point][1])
-                hwnd = UiaDll::current_native_window_handle(uia_control) # return HWND of UIA element
+                hwnd = UiaDll::handle_from_point(*locators[:point])
                 raise UnknownElementException, "#{locators[:point]} does not exist" if hwnd == 0
                 hwnd
               else
@@ -192,14 +191,6 @@ module RAutomation
             text_for(control_hwnd)
           end
 
-          def control_click(control_hwnd)
-            string_buffer = FFI::MemoryPointer.new :char, 1024
-            UiaDll::control_mouse_click control_hwnd, string_buffer, 1024
-            error_info = string_buffer.read_string
-            raise error_info unless error_info.empty?
-            true
-          end
-
           def set_control_focus(control_hwnd)
             within_foreground_thread control_hwnd do
               _set_control_focus(control_hwnd)
@@ -214,12 +205,7 @@ module RAutomation
           end
 
           def control_name(control_hwnd)
-            string_buffer = FFI::MemoryPointer.new :char, 255
-            if (UiaDll::get_control_name(control_hwnd, string_buffer, 255))
-              string_buffer.read_string
-            else
-              fail "Cannot get name for control with HWND 0x" + control_hwnd.to_s(16)
-            end
+            UiaDll::name(UiaDll::SearchCriteria.from_locator(control_hwnd, :hwnd => control_hwnd))
           end
 
           private

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

@@ -11,13 +11,13 @@ module RAutomation
         end
 
         def items
-          UiaDll::find_table_values(search_information).map do |list_item|
+          UiaDll::table_values(search_information).map do |list_item|
             @window.list_item(:value => list_item)
           end
         end
 
         def strings
-          UiaDll::find_table_values(search_information)
+          UiaDll::table_values(search_information)
         end
 
         def value

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

@@ -0,0 +1,31 @@
+module RAutomation
+  module Adapter
+    module MsUia
+      class Spinner < Control
+        def set(value)
+          UiaDll::set_spinner_value(search_information, value)
+        end
+
+        def value
+          UiaDll::spinner_value(search_information)
+        end
+
+        def minimum
+          UiaDll::spinner_min(search_information)
+        end
+
+        def maximum
+          UiaDll::spinner_max(search_information)
+        end
+
+        def increment
+          UiaDll::increment_spinner(search_information)
+        end
+
+        def decrement
+          UiaDll::decrement_spinner(search_information)
+        end
+      end
+    end
+  end
+end

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

@@ -108,9 +108,17 @@ module RAutomation
                  :how, HowToFind, :data, FindData
         end
 
-        ffi_lib File.dirname(__FILE__) + '/../../../../ext/UiaDll/Release/UiaDll.dll'
+        def self.uia_dll_directory
+          File.dirname(__FILE__) + '/../../../../ext/UiaDll/Release'
+        end
+
+
+        ffi_lib File.join(uia_dll_directory, 'UiaDll.dll')
         ffi_convention :stdcall
 
+        attach_function :init, :initialize, [:string], :void
+        init(uia_dll_directory)
+
         # Generic Control methods
         attach_function :cached_hwnd, :NativeWindowHandle, [SearchCriteria.by_ref], :long
         attach_function :ElementExists, [SearchCriteria.by_ref], :bool
@@ -189,6 +197,44 @@ module RAutomation
           string_from(:SelectList_Selection, search_information)
         end
 
+        # Spinner methods
+        attach_function :Spinner_GetValue,
+                        [SearchCriteria.by_ref, :pointer, :int], :double
+        attach_function :Spinner_SetValue,
+                        [SearchCriteria.by_ref, :double, :pointer, :int], :void
+        attach_function :Spinner_Minimum,
+                        [SearchCriteria.by_ref, :pointer, :int], :double
+        attach_function :Spinner_Maximum,
+                        [SearchCriteria.by_ref, :pointer, :int], :double
+        attach_function :Spinner_Increment,
+                        [SearchCriteria.by_ref, :pointer, :int], :double
+        attach_function :Spinner_Decrement,
+                        [SearchCriteria.by_ref, :pointer, :int], :double
+
+        def self.spinner_value(search_information)
+          can_throw(:Spinner_GetValue, search_information)
+        end
+
+        def self.set_spinner_value(search_information, value)
+          can_throw(:Spinner_SetValue, search_information, value)
+        end
+
+        def self.spinner_min(search_information)
+          can_throw(:Spinner_Minimum, search_information)
+        end
+
+        def self.spinner_max(search_information)
+          can_throw(:Spinner_Maximum, search_information)
+        end
+
+        def self.increment_spinner(search_information)
+          can_throw(:Spinner_Increment, search_information)
+        end
+
+        def self.decrement_spinner(search_information)
+          can_throw(:Spinner_Decrement, search_information)
+        end
+
         # Tab Control methods
         attach_function :TabControl_Items,
                         [SearchCriteria.by_ref, :pointer], :int
@@ -228,8 +274,6 @@ module RAutomation
                         [SearchCriteria.by_ref, :pointer], :int
         attach_function :Table_GetValues,
                         [SearchCriteria.by_ref, :pointer], :int
-        attach_function :Table_FindValues,
-                        [SearchCriteria.by_ref, :pointer], :int
         attach_function :table_row_count, :Table_RowCount,
                         [SearchCriteria.by_ref], :int
         attach_function :Table_CoordinateIsValid,
@@ -268,47 +312,31 @@ module RAutomation
           strings_from :Table_GetValues, search_information
         end
 
-        def self.find_table_values(search_information)
-          strings_from :Table_FindValues, search_information
-        end
-
         # String methods
         attach_function :clean_up_strings, :String_CleanUp,
                         [:pointer, :int], :void
 
-        attach_function :element_from_handle, :RA_ElementFromHandle,
-                        [:long], :pointer
-        attach_function :element_from_point, :RA_ElementFromPoint,
-                        [:int, :int], :pointer
-        attach_function :current_native_window_handle, :RA_CurrentNativeWindowHandle,
-                        [:pointer], :long
-        attach_function :move_mouse, :RA_MoveMouse,
+        attach_function :handle_from_point, :HandleFromPoint,
+                        [:int, :int], :long
+        attach_function :move_mouse, :MoveMouse,
                         [:int,:int], :long
-        attach_function :click_mouse, :RA_ClickMouse,
+        attach_function :click_mouse, :ClickMouse,
                         [], :long
-        attach_function :is_offscreen, :RA_CurrentIsOffscreen,
-                        [:pointer, :pointer], :int
-        attach_function :find_children, :RA_FindChildren,
-                        [:pointer, :pointer], :int
-        attach_function :get_control_name, :RA_GetControlName,
-                        [:long, :pointer, :int], :bool
-        attach_function :select, :RA_Select,
-                        [:pointer], :int
-        attach_function :expand_by_value, :RA_ExpandItemByValue,
+        attach_function :is_offscreen, :IsOffscreen,
+                        [SearchCriteria.by_ref], :bool
+        attach_function :expand_by_value, :ExpandItemByValue,
                         [SearchCriteria.by_ref, :string], :void
-        attach_function :expand_by_index, :RA_ExpandItemByIndex,
+        attach_function :expand_by_index, :ExpandItemByIndex,
                         [SearchCriteria.by_ref, :int], :void
-        attach_function :collapse_by_value, :RA_CollapseItemByValue,
+        attach_function :collapse_by_value, :CollapseItemByValue,
                         [SearchCriteria.by_ref, :string], :void
-        attach_function :collapse_by_index, :RA_CollapseItemByIndex,
+        attach_function :collapse_by_index, :CollapseItemByIndex,
                         [SearchCriteria.by_ref, :int], :void
-        attach_function :RA_Click,
+        attach_function :Click,
                         [SearchCriteria.by_ref, :pointer, :int], :bool
-        attach_function :control_mouse_click, :RA_PointAndClick,
-                        [:long, :pointer, :int], :void
 
         def self.control_click(search_information)
-          can_throw(:RA_Click, search_information)
+          can_throw(:Click, search_information)
         end
 
         private

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

@@ -169,6 +169,11 @@ module RAutomation
           TabControl.new(self, locator)
         end
 
+        # @see Spinner#initialize
+        def spinner(locator)
+          Spinner.new(self, locator)
+        end
+
         # @see TextField#initialize
         # @see RAutomation::Window#text_field
         def text_field(locator)
@@ -187,10 +192,6 @@ module RAutomation
           Functions.respond_to?(name) ? Functions.send(name, *args) : super
         end
 
-        def count_children(element)
-          UiaDll::find_children(element, nil)
-        end
-
         def bounding_rectangle
           window = UiaDll::element_from_handle(hwnd)
 

data/rautomation.gemspec

@@ -19,6 +19,7 @@ RAutomation provides:
   ext_binaries = [
     "ext/IAccessibleDLL/Release/IAccessibleDLL.dll",
     "ext/UiaDll/Release/UiaDll.dll",
+    "ext/UiaDll/Release/RAutomation.UIA.dll",
     "ext/WindowsForms/Release/WindowsForms.exe"
   ]
   s.files         = `git ls-files`.split("\n") + ext_binaries

data/spec/adapter/ms_uia/spinner_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+include RAutomation::Adapter
+
+describe MsUia::Spinner, :if => SpecHelper.adapter == :ms_uia  do
+  let(:main_window) { RAutomation::Window.new(:title => 'MainFormWindow') }
+  let(:data_entry) { main_window.button(:value => 'Data Entry Form').click { window.exist? } }
+  let(:window) { RAutomation::Window.new(:title => 'DataEntryForm') }
+
+  subject { window.spinner(:id => 'numericUpDown1') }
+
+  before(:each) do
+    data_entry
+  end
+
+  it { should exist }
+
+  it '#set' do
+    subject.set 4.0
+    subject.value.should eq(4.0)
+  end
+
+  it '#minimum' do
+    subject.minimum.should eq(-100.0)
+  end
+
+  it '#maximum' do
+    subject.maximum.should eq(100.0)
+  end
+
+  it 'likes for values to be within range' do
+    lambda { subject.set(1000.0) }.should raise_error
+  end
+
+  it '#increment' do
+    subject.set 5.0
+    subject.increment.should eq(6.0)
+  end
+
+  it '#decrement' do
+    subject.set 5.0
+    subject.decrement.should eq(4.0)
+  end
+end

data/spec/adapter/ms_uia/value_control_spec.rb

@@ -5,7 +5,7 @@ describe "MsUia::ValueControl", :if => SpecHelper.adapter == :ms_uia do
   let(:value_control) { window.value_control(:id => "automatableMonthCalendar1") }
 
   it "can set and get values" do
-    value_control.set "12/25/2012"
-    value_control.value.should eq("12/25/2012 12:00:00 AM")
+    value_control.set '12/25/2012'
+    value_control.value.should eq('12/25/2012')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rautomation
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -105,40 +105,38 @@ files:
 - ext/IAccessibleDLL/IAccessibleDLL/stdafx.h
 - ext/IAccessibleDLL/IAccessibleDLL/table_support.cpp
 - ext/IAccessibleDLL/IAccessibleDLL/targetver.h
+- ext/UiaDll/RAutomation.UIA/Controls/Clicker.cs
+- ext/UiaDll/RAutomation.UIA/Controls/SelectList.cs
+- ext/UiaDll/RAutomation.UIA/Controls/Spinner.cs
+- ext/UiaDll/RAutomation.UIA/Controls/TabControl.cs
+- ext/UiaDll/RAutomation.UIA/Controls/TableControl.cs
+- ext/UiaDll/RAutomation.UIA/Controls/TextControl.cs
+- ext/UiaDll/RAutomation.UIA/Expander.cs
+- ext/UiaDll/RAutomation.UIA/Extensions/Element.cs
+- ext/UiaDll/RAutomation.UIA/Extensions/Enumerable.cs
+- ext/UiaDll/RAutomation.UIA/Extensions/Property.cs
+- ext/UiaDll/RAutomation.UIA/Properties/AssemblyInfo.cs
+- ext/UiaDll/RAutomation.UIA/Properties/AutomationProperties.cs
+- ext/UiaDll/RAutomation.UIA/RAutomation.UIA.csproj
 - ext/UiaDll/UiaDll.sln
 - ext/UiaDll/UiaDll/AssemblyInfo.cpp
-- ext/UiaDll/UiaDll/AutomatedSelectList.cpp
-- ext/UiaDll/UiaDll/AutomatedSelectList.h
-- ext/UiaDll/UiaDll/AutomatedTabControl.cpp
-- ext/UiaDll/UiaDll/AutomatedTabControl.h
-- ext/UiaDll/UiaDll/AutomatedTable.cpp
-- ext/UiaDll/UiaDll/AutomatedTable.h
-- ext/UiaDll/UiaDll/AutomatedText.cpp
-- ext/UiaDll/UiaDll/AutomatedText.h
-- ext/UiaDll/UiaDll/AutomationClicker.cpp
-- ext/UiaDll/UiaDll/AutomationClicker.h
-- ext/UiaDll/UiaDll/AutomationControl.cpp
-- ext/UiaDll/UiaDll/AutomationControl.h
-- ext/UiaDll/UiaDll/AutomationFinder.cpp
-- ext/UiaDll/UiaDll/AutomationFinder.h
 - ext/UiaDll/UiaDll/ControlMethods.cpp
-- ext/UiaDll/UiaDll/ExpandCollapseHelper.cpp
-- ext/UiaDll/UiaDll/ExpandCollapseHelper.h
+- ext/UiaDll/UiaDll/DynamicAssemblyResolver.cpp
+- ext/UiaDll/UiaDll/DynamicAssemblyResolver.h
+- ext/UiaDll/UiaDll/Locator.cpp
+- ext/UiaDll/UiaDll/Locator.h
 - ext/UiaDll/UiaDll/MenuItemSelector.cpp
 - ext/UiaDll/UiaDll/MenuItemSelector.h
 - ext/UiaDll/UiaDll/MenuMethods.cpp
 - ext/UiaDll/UiaDll/ReadMe.txt
 - ext/UiaDll/UiaDll/SelectListMethods.cpp
-- ext/UiaDll/UiaDll/SelectionItem.cpp
-- ext/UiaDll/UiaDll/SelectionItem.h
+- ext/UiaDll/UiaDll/SpinnerMethods.cpp
 - ext/UiaDll/UiaDll/StringHelper.cpp
 - ext/UiaDll/UiaDll/StringHelper.h
 - ext/UiaDll/UiaDll/StringMethods.cpp
 - ext/UiaDll/UiaDll/TabControlMethods.cpp
 - ext/UiaDll/UiaDll/TableMethods.cpp
 - ext/UiaDll/UiaDll/TextMethods.cpp
-- ext/UiaDll/UiaDll/Toggle.cpp
-- ext/UiaDll/UiaDll/Toggle.h
 - ext/UiaDll/UiaDll/ToggleStateHelper.h
 - ext/UiaDll/UiaDll/UiaDll.cpp
 - ext/UiaDll/UiaDll/UiaDll.h
@@ -147,7 +145,6 @@ files:
 - ext/UiaDll/UiaDll/app.ico
 - ext/UiaDll/UiaDll/app.rc
 - ext/UiaDll/UiaDll/dllmain.cpp
-- ext/UiaDll/UiaDll/globals.h
 - ext/UiaDll/UiaDll/resource.h
 - ext/UiaDll/UiaDll/stdafx.cpp
 - ext/UiaDll/UiaDll/stdafx.h
@@ -156,8 +153,6 @@ files:
 - ext/WindowsForms/WindowsForms/AboutBox.Designer.cs
 - ext/WindowsForms/WindowsForms/AboutBox.cs
 - ext/WindowsForms/WindowsForms/AboutBox.resx
-- ext/WindowsForms/WindowsForms/AutomatableMonthCalendar.cs
-- ext/WindowsForms/WindowsForms/AutomationHelpers/AutomationProvider.cs
 - ext/WindowsForms/WindowsForms/DataEntryForm.Designer.cs
 - ext/WindowsForms/WindowsForms/DataEntryForm.cs
 - ext/WindowsForms/WindowsForms/DataEntryForm.resx
@@ -180,6 +175,8 @@ files:
 - ext/WindowsForms/WindowsForms/SimpleElementsForm.Designer.cs
 - ext/WindowsForms/WindowsForms/SimpleElementsForm.cs
 - ext/WindowsForms/WindowsForms/SimpleElementsForm.resx
+- ext/WindowsForms/WindowsForms/UIA.Extensions.dll
+- ext/WindowsForms/WindowsForms/ValueMonthCalendar.cs
 - ext/WindowsForms/WindowsForms/WindowsForms.csproj
 - lib/rautomation.rb
 - lib/rautomation/adapter/autoit.rb
@@ -205,6 +202,7 @@ files:
 - lib/rautomation/adapter/ms_uia/menu.rb
 - lib/rautomation/adapter/ms_uia/radio.rb
 - lib/rautomation/adapter/ms_uia/select_list.rb
+- lib/rautomation/adapter/ms_uia/spinner.rb
 - lib/rautomation/adapter/ms_uia/tab_control.rb
 - lib/rautomation/adapter/ms_uia/table.rb
 - lib/rautomation/adapter/ms_uia/text_field.rb
@@ -247,6 +245,7 @@ files:
 - spec/adapter/ms_uia/listbox_spec.rb
 - spec/adapter/ms_uia/radio_spec.rb
 - spec/adapter/ms_uia/select_list_spec.rb
+- spec/adapter/ms_uia/spinner_spec.rb
 - spec/adapter/ms_uia/tab_control_spec.rb
 - spec/adapter/ms_uia/table_spec.rb
 - spec/adapter/ms_uia/text_field_spec.rb
@@ -271,6 +270,7 @@ files:
 - spec/windows_spec.rb
 - ext/IAccessibleDLL/Release/IAccessibleDLL.dll
 - ext/UiaDll/Release/UiaDll.dll
+- ext/UiaDll/Release/RAutomation.UIA.dll
 - ext/WindowsForms/Release/WindowsForms.exe
 homepage: http://github.com/jarmo/RAutomation
 licenses:
@@ -309,6 +309,7 @@ test_files:
 - spec/adapter/ms_uia/listbox_spec.rb
 - spec/adapter/ms_uia/radio_spec.rb
 - spec/adapter/ms_uia/select_list_spec.rb
+- spec/adapter/ms_uia/spinner_spec.rb
 - spec/adapter/ms_uia/tab_control_spec.rb
 - spec/adapter/ms_uia/table_spec.rb
 - spec/adapter/ms_uia/text_field_spec.rb