uia 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,8 +1,12 @@
-=== Version 0.1.1 / 2013-02-07
+=== Version 0.1.2 / 2014-02-11
+*   Enhancements
+    *   Added #drag method to Element to drag the mouse within a client area of an element
+
+=== Version 0.1.1 / 2014-02-07
 *   Bug Fixes
     *   Prior to trying to click on an element, it needs to scroll to and focus it first
 
-=== Version 0.1 / 2013-02-06
+=== Version 0.1 / 2014-02-06
 *   Enhancements
     *   changed #click to be clickable point only
     *   added #click_center to try to click in the bounding_rectangle

data/ext/UiaDll/UIA.Helper/Element.cs

@@ -114,12 +114,12 @@ namespace UIA.Helper
 
         public void ClickClickablePoint()
         {
-            Clicker.ClickClickablePoint(_element);
+            Mouse.ClickClickablePoint(_element);
         }
 
         public void ClickCenter()
         {
-            Clicker.ClickCenter(_element);
+            Mouse.ClickCenter(_element);
         }
 
         public static Element From(AutomationElement element)

data/ext/UiaDll/UIA.Helper/{Clicker.cs → Mouse.cs}

@@ -6,7 +6,7 @@ using System.Windows.Forms;
 
 namespace UIA.Helper
 {
-    public class Clicker
+    public class Mouse
     {
         [DllImport("user32.dll")]
         static extern void mouse_event(uint flags, uint x, uint y, uint data, int extraInfo);
@@ -21,6 +21,14 @@ namespace UIA.Helper
         private const uint MOUSEEVENTLF_LEFTDOWN = 0x2;
         private const uint MOUSEEVENTLF_LEFTUP = 0x4;
 
+        public static void Drag(int startX, int startY, int endX, int endY)
+        {
+            Cursor.Position = new System.Drawing.Point(startX, startY);
+            Down();
+            Cursor.Position = new System.Drawing.Point(endX, endY);
+            Up();
+        }
+
         public static void ClickClickablePoint(AutomationElement element)
         {
             Click(element, element.GetClickablePoint);
@@ -39,10 +47,20 @@ namespace UIA.Helper
             var point = GetPoint();
 
             Cursor.Position = new System.Drawing.Point((int) point.X, (int) point.Y);
-            mouse_event(MOUSEEVENTLF_LEFTDOWN, 0, 0, 0, 0);
+            Down();
+            Up();
+        }
+
+        private static void Up()
+        {
             mouse_event(MOUSEEVENTLF_LEFTUP, 0, 0, 0, 0);
         }
 
+        private static void Down()
+        {
+            mouse_event(MOUSEEVENTLF_LEFTDOWN, 0, 0, 0, 0);
+        }
+
         private static Point Center(AutomationElement element)
         {
             try

data/ext/UiaDll/UIA.Helper/UIA.Helper.csproj

@@ -46,7 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AutomationPropertyCondition.cs" />
-    <Compile Include="Clicker.cs" />
+    <Compile Include="Mouse.cs" />
     <Compile Include="Element.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

data/ext/UiaDll/UiaDll/MouseMethods.cpp

@@ -0,0 +1,13 @@
+#include "Stdafx.h"
+
+using namespace UIA::Helper;
+
+extern "C" {
+  __declspec(dllexport) void Mouse_Drag(const int startX, const int startY, const int endX, const int endY, char* errorInformation, const int errorInformationLength) {
+    try {
+      Mouse::Drag(startX, startY, endX, endY);
+    } catch(Exception^ e) {
+      StringHelper::CopyToUnmanagedString(e->Message, errorInformation, errorInformationLength);
+    }
+  }
+}

data/ext/UiaDll/UiaDll/UiaDll.vcxproj

@@ -92,6 +92,7 @@
     <ClCompile Include="ElementMethods.cpp" />
     <ClCompile Include="ExpandCollapseMethods.cpp" />
     <ClCompile Include="InvokePatternMethods.cpp" />
+    <ClCompile Include="MouseMethods.cpp" />
     <ClCompile Include="RangeValueMethods.cpp" />
     <ClCompile Include="SelectionItemMethods.cpp" />
     <ClCompile Include="SelectionMethods.cpp" />

data/ext/UiaDll/UiaDll/UiaDll.vcxproj.filters

@@ -86,5 +86,8 @@
     <ClCompile Include="TextMethods.cpp">
       <Filter>Source Files\Patterns</Filter>
     </ClCompile>
+    <ClCompile Include="MouseMethods.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

data/lib/uia/element.rb

@@ -26,6 +26,22 @@ module Uia
       Library::Constants::ControlTypes.find(@default) { |_, v| v == @element.control_type_id }.first
     end
 
+    def drag(info)
+      start_x, start_y = info[:start]
+      end_x, end_y = info[:end]
+      left, top = bounding_rectangle
+
+      coords = [
+          left + start_x,
+          top + start_y,
+          left + end_x,
+          top + end_y
+      ]
+
+      focus
+      Library.drag *coords
+    end
+
     def send_keys(*keys)
       Library.send_keys @element, Keys.encode(keys)
     end
@@ -74,7 +90,9 @@ module Uia
     end
 
     def focus
-      Library.focus(@element)
+      until focused?
+        Library.focus(@element)
+      end
     end
   end
 end

data/lib/uia/library.rb

@@ -75,6 +75,9 @@ module Uia
     attach_throwable_function :focus, :Element_Focus, [:pointer], :void
     attach_throwable_function :refresh, :Element_Refresh, [:pointer], :void
 
+    # mouse methods
+    attach_throwable_function :drag, :Mouse_Drag, [:int, :int, :int, :int], :void
+
     # WindowPattern methods
     attach_throwable_function :window_information, :Window_Information, [:pointer], WindowInformation.by_ref
     attach_throwable_function :set_visual_state, :Window_SetVisualState, [:pointer, :string], :void

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/uia/element_spec.rb

@@ -5,6 +5,25 @@ describe Uia::Element do
   Given(:about_box) { wait_until { Uia.find_element(id: 'AboutBox') } }
   Given { element.as(:window).visual_state = :normal }
 
+  context '#drag' do
+    Given(:text_field) do
+      text_field = element.find(id: 'multiLineTextField')
+      text_field.send_keys ['this', :enter, 'is', :enter, 'multiple', :enter, 'lines']
+      text_field
+    end
+    Given(:dimensions) do
+      r = text_field.bounding_rectangle
+      {width: r[2], height: r[3]}
+    end
+
+    When do
+      text_field.drag start: [2, 2], end: [dimensions[:width], dimensions[:height]]
+      text_field.send_keys :backspace
+    end
+
+    Then { expect(text_field.as(:text).text).to eq('') }
+  end
+
   context 'properties' do
     let(:raw_element) { element.instance_variable_get(:@element) }
     Then { element.handle != 0 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -139,9 +139,9 @@ files:
 - Rakefile
 - ext/.gitignore
 - ext/UiaDll/UIA.Helper/AutomationPropertyCondition.cs
-- ext/UiaDll/UIA.Helper/Clicker.cs
 - ext/UiaDll/UIA.Helper/Element.cs
 - ext/UiaDll/UIA.Helper/Extensions.cs
+- ext/UiaDll/UIA.Helper/Mouse.cs
 - ext/UiaDll/UIA.Helper/Properties/AssemblyInfo.cs
 - ext/UiaDll/UIA.Helper/UIA.Helper.csproj
 - ext/UiaDll/UiaDll.Test/AssemblyInfo.cpp
@@ -168,6 +168,7 @@ files:
 - ext/UiaDll/UiaDll/ElementStructures.h
 - ext/UiaDll/UiaDll/ExpandCollapseMethods.cpp
 - ext/UiaDll/UiaDll/InvokePatternMethods.cpp
+- ext/UiaDll/UiaDll/MouseMethods.cpp
 - ext/UiaDll/UiaDll/PatternInformationStructures.h
 - ext/UiaDll/UiaDll/RangeValueMethods.cpp
 - ext/UiaDll/UiaDll/ReadMe.txt
@@ -249,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 302462739
+      hash: 237115197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 302462739
+      hash: 237115197
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24