rautomation 0.8.0 → 0.9.0

data/ext/WindowsForms/WindowsForms/MainFormWindow.Designer.cs

@@ -67,6 +67,8 @@
             this.toToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.treeView = new System.Windows.Forms.TreeView();
+            this.multiLineTextField = new System.Windows.Forms.TextBox();
+            this.automatableMonthCalendar1 = new WindowsForms.AutomatableMonthCalendar();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -341,7 +343,7 @@
             this.faileToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(724, 24);
+            this.menuStrip1.Size = new System.Drawing.Size(657, 24);
             this.menuStrip1.TabIndex = 15;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -404,11 +406,29 @@
             this.treeView.Size = new System.Drawing.Size(159, 177);
             this.treeView.TabIndex = 16;
             // 
+            // multiLineTextField
+            // 
+            this.multiLineTextField.Location = new System.Drawing.Point(142, 339);
+            this.multiLineTextField.Multiline = true;
+            this.multiLineTextField.Name = "multiLineTextField";
+            this.multiLineTextField.Size = new System.Drawing.Size(325, 123);
+            this.multiLineTextField.TabIndex = 5;
+            // 
+            // automatableMonthCalendar1
+            // 
+            this.automatableMonthCalendar1.Location = new System.Drawing.Point(142, 474);
+            this.automatableMonthCalendar1.MaxSelectionCount = 1;
+            this.automatableMonthCalendar1.Name = "automatableMonthCalendar1";
+            this.automatableMonthCalendar1.TabIndex = 17;
+            this.automatableMonthCalendar1.DateChanged += new System.Windows.Forms.DateRangeEventHandler(this.automatableMonthCalendar1_DateChanged);
+            // 
             // MainFormWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(724, 474);
+            this.ClientSize = new System.Drawing.Size(657, 657);
+            this.Controls.Add(this.automatableMonthCalendar1);
+            this.Controls.Add(this.multiLineTextField);
             this.Controls.Add(this.treeView);
             this.Controls.Add(this.FruitListBox);
             this.Controls.Add(this.textBoxDisabled);
@@ -466,14 +486,16 @@
         private System.Windows.Forms.RadioButton radioButtonDisabled;
         private System.Windows.Forms.TextBox textBoxDisabled;
         private System.Windows.Forms.ComboBox comboBoxDisabled;
-        private System.Windows.Forms.ListBox FruitListBox;
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem faileToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem roundaboutWayToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem1;
-        private System.Windows.Forms.TreeView treeView;
+        private System.Windows.Forms.ListBox FruitListBox;
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem faileToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem roundaboutWayToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem toToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem1;
+        private System.Windows.Forms.TreeView treeView;
+        private System.Windows.Forms.TextBox multiLineTextField;
+        private AutomatableMonthCalendar automatableMonthCalendar1;
     }
 }
 

data/ext/WindowsForms/WindowsForms/MainFormWindow.cs

@@ -73,5 +73,15 @@ namespace WindowsForms
             SimpleElementsForm buttonForm = new SimpleElementsForm();
             buttonForm.Show();
         }
+
+        private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void automatableMonthCalendar1_DateChanged(object sender, DateRangeEventArgs e)
+        {
+
+        }
     }
 }

data/ext/WindowsForms/WindowsForms/WindowsForms.csproj

@@ -44,6 +44,10 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="UIAutomationClient" />
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutBox.cs">
@@ -52,6 +56,10 @@
     <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>
@@ -112,12 +120,13 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

data/lib/rautomation/adapter/ms_uia.rb

@@ -12,6 +12,7 @@ require File.dirname(__FILE__) + "/ms_uia/locators"
 require File.dirname(__FILE__) + "/ms_uia/window"
 require File.dirname(__FILE__) + "/ms_uia/button_helper"
 require File.dirname(__FILE__) + "/ms_uia/control"
+require File.dirname(__FILE__) + "/ms_uia/value_control"
 require File.dirname(__FILE__) + "/ms_uia/button"
 require File.dirname(__FILE__) + "/ms_uia/checkbox"
 require File.dirname(__FILE__) + "/ms_uia/menu"

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

@@ -6,24 +6,16 @@ module RAutomation
         include Locators
         include ButtonHelper
 
-        def value
-          checkbox = uia_element
-
-          checkbox_value = FFI::MemoryPointer.new :char, UiaDll::get_name(checkbox, nil) + 1
-          UiaDll::get_name(checkbox, checkbox_value)
-
-          checkbox_value.read_string
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_CHECKBOX_CONTROL_TYPE)
         end
 
         def set?
-          UiaDll::get_is_set(uia_element)
+          UiaDll::is_set(search_information)
         end
 
         alias_method :exists?, :exist?
+        alias_method :value, :control_name
 
       end
     end

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

@@ -99,6 +99,7 @@ module RAutomation
         UIA_RADIO_BUTTON_CONTROL_TYPE = 50013
         UIA_COMBOBOX_CONTROL_TYPE = 50003
         UIA_EDIT_CONTROL_TYPE = 50004
+        UIA_DOCUMENT_CONTROL_TYPE = 50030
         UIA_HEADER_CONTROL_TYPE = 50034
         UIA_HEADER_ITEM_CONTROL_TYPE = 50035
         UIA_WINDOW_CONTROL_TYPE = 50032

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

@@ -24,55 +24,15 @@ module RAutomation
           Functions.control_hwnd(@window.hwnd, @locators)
         end
 
-        def uia_element
-#          puts "finding element with #{@locators.inspect}"
-
-          case
-            #Causes a bug for some reason
-#            when @locators[:value]
-#              uia_window = UiaDll::element_from_handle(@window.hwnd)
-#              begin
-#                uia_window.read_pointer
-#              rescue FFI::NullPointerError => e
-#                raise UnknownElementException, "Window with handle #{@window.hwnd} does not exist"
-#              end
-#              uia_control = UiaDll::find_child_by_name(uia_window, @locators[:value].to_s)
-#              begin
-#                uia_control.read_pointer
-#              rescue FFI::NullPointerError => e
-#                raise UnknownElementException, "#{@locators[:value]} does not exist"
-#              end
-            when @locators[:focus]
-              uia_control = UiaDll::get_focused_element
-              begin
-                uia_control.read_pointer
-              rescue FFI::NullPointerError => e
-                raise UnknownElementException, "Focused element does not exist"
-              end
-            when @locators[:id]
-              uia_window = UiaDll::element_from_handle(@window.hwnd)
-              uia_control = UiaDll::find_child_by_id(uia_window, @locators[:id].to_s)
-              begin
-                uia_control.read_pointer
-              rescue FFI::NullPointerError => e
-                raise UnknownElementException, "#{@locators[:id]} does not exist"
-              end
-            when @locators[:point]
-              uia_control = UiaDll::element_from_point(@locators[:point][0], @locators[:point][1])
-              begin
-                uia_control.read_pointer
-              rescue FFI::NullPointerError => e
-                raise UnknownElementException, "#{@locators[:point]} does not exist"
-              end
-            else
-              handle= hwnd
-              raise UnknownElementException, "Element with #{@locators.inspect} does not exist" if (handle == 0) or (handle == nil)
-              uia_control = UiaDll::element_from_handle(handle)
+        def search_information
+          info = UiaDll::SearchCriteria.from_locator(@window.hwnd, @locators)
+          if info.how == 0
+            info.how = :hwnd
+            info.data = hwnd
           end
-          uia_control
+          info
         end
 
-
         #todo - replace with UIA version
         def click
           assert_enabled
@@ -90,7 +50,7 @@ module RAutomation
 
         def exist?
           begin
-            !!uia_element
+            UiaDll::exists?(search_information) || !!hwnd
           rescue UnknownElementException
             false
           end
@@ -117,12 +77,7 @@ module RAutomation
         end
 
         def bounding_rectangle
-          control = uia_element
-
-          boundary = FFI::MemoryPointer.new :long, 4
-          UiaDll::bounding_rectangle(control, boundary)
-
-          boundary.read_array_of_long(4)
+          UiaDll::bounding_rectangle(search_information)
         end
 
         def visible?
@@ -141,32 +96,24 @@ module RAutomation
           false
         end
 
-        def matches_type?(clazz)
-          get_current_control_type == clazz
+        def matches_type?(*classes)
+          classes.include? get_current_control_type
         end
 
         def get_current_control_type
-          UiaDll::current_control_type(uia_element)
+          UiaDll::current_control_type(search_information)
         end
 
         def new_pid
-          UiaDll::current_process_id(uia_element)
+          UiaDll::process_id(search_information)
         end
 
         def control_name
-          uia_control = uia_element
-          element_name = FFI::MemoryPointer.new :char, UiaDll::get_name(uia_control, nil) + 1
-
-          UiaDll::get_name(uia_control, element_name)
-          element_name.read_string
+          UiaDll::name(search_information)
         end
 
         def control_class
-          uia_control = uia_element
-          element_class = FFI::MemoryPointer.new :char, UiaDll::get_class_name(uia_control, nil) + 1
-
-          UiaDll::get_class_name(uia_control, element_class)
-          element_class.read_string
+          UiaDll::class_name(search_information)
         end
 
         alias_method :exists?, :exist?

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

@@ -8,7 +8,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
 
@@ -85,8 +84,6 @@ module RAutomation
                         [:long, :long, :pointer, :long, :pointer], :void
         attach_function :select_table_row, :select_table_row,
                         [:long, :long, :long], :void
-        attach_function :get_table_row_state, :get_table_row_state,
-                        [:long, :long, :long], :long
 
         class << self
 
@@ -230,32 +227,19 @@ module RAutomation
           def retrieve_combobox_item_text(control_hwnd, item_no)
             text_len = 1024
             string_buffer = FFI::MemoryPointer.new :char, text_len
-            UiaDll::get_combobox_value control_hwnd, item_no, string_buffer, text_len
+            UiaDll::select_list_value_at control_hwnd, item_no, string_buffer, text_len
             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)
+            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
           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/ms_uia/list_box.rb

@@ -7,23 +7,13 @@ module RAutomation
         include Locators
 
         def count
-          UiaDll::find_children(uia_element, nil)
+          UiaDll::select_list_count search_information
         end
 
         def items
-          list_items = []
-          children = FFI::MemoryPointer.new :pointer, self.count
-          length = UiaDll::find_children(uia_element, children)
-
-          children.read_array_of_pointer(length).each do |child|
-            if (UiaDll::current_control_type(child) == Constants::UIA_LIST_ITEM_CONTROL_TYPE) or (UiaDll::current_control_type(child) == Constants::UIA_DATA_ITEM_CONTROL_TYPE)
-              child_name = FFI::MemoryPointer.new :char, UiaDll::get_name(child, nil) + 1
-              UiaDll::get_name(child, child_name)
-              list_items.push(@window.list_item(:value => child_name.read_string))
-            end
+          UiaDll::find_table_values(search_information).map do |list_item|
+            @window.list_item(:value => list_item)
           end
-
-          list_items
         end
 
         def strings
@@ -31,13 +21,7 @@ module RAutomation
         end
 
         def value
-          count.times do |index|
-            if selected?(index)
-              return strings[index]
-            end
-          end
-
-          ""
+          UiaDll::selection search_information
         end
 
         def exist?
@@ -55,13 +39,7 @@ module RAutomation
         end
 
         def select(index)
-          children = FFI::MemoryPointer.new :pointer, self.count
-
-          length = UiaDll::find_children(uia_element, children)
-
-          target_element = children.read_array_of_pointer(length)[index]
-
-          UiaDll::select(target_element)
+          UiaDll::select_list_select_index search_information, index
         end
 
         def list_boundary

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

@@ -5,43 +5,16 @@ module RAutomation
         include WaitHelper
         include Locators
 
-        #Can't get by value without a handle or a bug fix in the new way of getting a control by value so this is a workaround
-        def uia_element
-          if @locators[:value]
-            uia_window = UiaDll::element_from_handle(@window.hwnd)
-            begin
-              uia_window.read_pointer
-            rescue FFI::NullPointerError => e
-              raise UnknownElementException, "Window with handle #{@window.hwnd} does not exist"
-            end
-            uia_control = UiaDll::find_child_by_name(uia_window, @locators[:value].to_s)
-            begin
-              uia_control.read_pointer
-            rescue FFI::NullPointerError => e
-              raise UnknownElementException, "#{@locators[:value]} does not exist"
-            end
-            uia_control
-          else
-            super
-          end
-        end
-
-        def value
-          list_item = uia_element
-          item_value = FFI::MemoryPointer.new :char, UiaDll::get_name(list_item, nil) + 1
-          UiaDll::get_name(list_item, item_value)
-          item_value.read_string
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_LIST_ITEM_CONTROL_TYPE)
         end
 
         def selected?
-          UiaDll::get_is_selected(uia_element)
+          UiaDll::is_selected(search_information)
         end
 
         alias_method :exists?, :exist?
+        alias_method :value, :control_name
 
       end
     end