rautomation 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 178133c72cc25827e3ce116041461d98735467f7
-  data.tar.gz: 67c1b8edff6687922c7fb97a879af84e10c58107
+  metadata.gz: 5e50cb69e80b4659265b0edfc11904e064efee3b
+  data.tar.gz: 6ea9b5a0d4cfc8c2c43ddd995c7a0c8b07ccff7e
 SHA512:
-  metadata.gz: 400deacbc79aa298a3d33dd0fc186d9ce6cf3c19af9a5cc5e5cf10e838d4b9b1048b1cd8fc7794feec56c07097111b81a7c4798d8d08bfa479dcf04393534ffc
-  data.tar.gz: c4c2e66e9d4699eedf120aa1352a3111fc1b956ffd0a48f44dbf471c5e158d7fa7e4ecdbacfc8a81b8c815a0839a3ff3b065e9323cd29ec4101bdf4cbf3826de
+  metadata.gz: 6bbe2f8ed80c1dff85044ce04fba2e62fac3489045d4cadaf792322f70eac4a9f06e08a4d86e6ec0e3afabc9ac6559e166f75397976b1af1f3ed76874976e88f
+  data.tar.gz: 2400713a652d47652e93249c2a38dcd8e809f46a619ea986762bada8d561f13e2eed3dff293eb2fc84020654efdf728599492a431026a6729b97543bd545578f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rautomation (0.12.0)
+    rautomation (0.13.0)
       ffi
 
 GEM

data/History.rdoc

@@ -1,4 +1,14 @@
-== 0.12.0
+== 0.13.0
+
+=== MsUia adapter
+
+  * Added #select and #clear into SelectList::SelectListOption for multi-select support
+  * Removed SelectList#select and SelectList#set
+  * Added #select, #selected? and #clear to Table::Row for multi-select support
+  * Removed Table#select and Table#selected?
+  * Fixed an issue with selecting ListBox items that our outside of the viewable area
+
+== 0.12.0 / 2013-09-05
 
 === MsUia adapter
 

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.13.0

data/ext/UiaDll/RAutomation.UIA/Controls/Clicker.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Threading;
+using System.Windows;
 using System.Windows.Automation;
 using System.Windows.Forms;
 using RAutomation.UIA.Extensions;
@@ -49,9 +51,11 @@ namespace RAutomation.UIA.Controls
 
         public static void MouseClick(AutomationElement element)
         {
+            element.ScrollToIfPossible();
             element.SetFocus();
+
             var clickablePoint = element.GetClickablePoint();
-            Cursor.Position = new System.Drawing.Point((int) clickablePoint.X, (int) clickablePoint.Y);
+            Cursor.Position = new System.Drawing.Point((int)clickablePoint.X, (int)clickablePoint.Y);
             mouse_event(MOUSEEVENTLF_LEFTDOWN, 0, 0, 0, 0);
             mouse_event(MOUSEEVENTLF_LEFTUP, 0, 0, 0, 0);
         }

data/ext/UiaDll/RAutomation.UIA/Controls/SelectList.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Windows;
 using System.Windows.Automation;
 using RAutomation.UIA.Extensions;
 using RAutomation.UIA.Properties;
@@ -49,7 +51,35 @@ namespace RAutomation.UIA.Controls
             }
         }
 
-        private static void Select(AutomationElement element)
+        public string[] Selections
+        {
+            get { return SelectionPattern.GetSelection().Select(x => x.Current.Name).ToArray(); }
+        }
+
+        public void Remove(int index)
+        {
+            SelectionItems.ElementAt(index).AsSelectionItem().RemoveFromSelection();
+        }
+
+        public void Remove(string value)
+        {
+            SelectionNamed(value).RemoveFromSelection();
+        }
+
+        private void Select(AutomationElement element)
+        {
+            if (SelectionPattern.CanSelectMultiple)
+                MultipleSelect(element);
+            else
+                SingleSelect(element);
+        }
+
+        private static void MultipleSelect(AutomationElement element)
+        {
+            element.AsSelectionItem().AddToSelection();
+        }
+
+        private static void SingleSelect(AutomationElement element)
         {
             var selectionItem = element.AsSelectionItem();
 
@@ -63,6 +93,16 @@ namespace RAutomation.UIA.Controls
                 selectionItem.Select();
         }
 
+        private SelectionPattern.SelectionPatternInformation SelectionPattern
+        {
+            get { return _element.As<SelectionPattern>(System.Windows.Automation.SelectionPattern.Pattern).Current; }
+        }
+
+        private SelectionItemPattern SelectionNamed(string value)
+        {
+            return SelectionItems.First(x => x.Current.Name == value).AsSelectionItem();
+        }
+
         private static bool IsSelected(AutomationElement element)
         {
             return element.AsSelectionItem().Current.IsSelected;

data/ext/UiaDll/RAutomation.UIA/Controls/TableControl.cs

@@ -23,12 +23,27 @@ namespace RAutomation.UIA.Controls
         public int SelectedIndex
         {
             get { return SelectionItems.IndexOf(x => x.Current.IsSelected); }
-            set { DataItems.ElementAt(value).AsSelectionItem().Select(); }
+            set { Select(value); }
+        }
+
+        public bool IsRowSelected(int dataItemIndex)
+        {
+            return DataItems.ElementAt(dataItemIndex).AsSelectionItem().Current.IsSelected;
+        }
+
+        public void Remove(int dataItemIndex)
+        {
+            DataItems.ElementAt(dataItemIndex).AsSelectionItem().RemoveFromSelection();
+        }
+
+        public void Remove(string dataItemValue)
+        {
+            DataItems.FirstOrDefault(x => x.Current.Name == dataItemValue).AsSelectionItem().RemoveFromSelection();
         }
 
         public string Value
         {
-            set { SelectionElements.First(x => x.Current.Name == value).AsSelectionItem().Select(); }
+            set { Select(value); }
         }
 
         public bool Exists(int row, int column)
@@ -56,6 +71,26 @@ namespace RAutomation.UIA.Controls
             get { return TableOrListItems.Select(x => x.Current.Name).ToArray(); }
         }
 
+        private void Select(int value)
+        {
+            var selectionItem = DataItems.ElementAt(value).AsSelectionItem();
+
+            if (SelectionPattern.CanSelectMultiple)
+                selectionItem.AddToSelection();
+            else
+                selectionItem.Select();
+        }
+
+        private SelectionPattern.SelectionPatternInformation SelectionPattern
+        {
+            get { return _element.As<SelectionPattern>(SelectionPatternIdentifiers.Pattern).Current; }
+        }
+
+        private void Select(string value)
+        {
+            SelectionElements.First(x => x.Current.Name == value).AsSelectionItem().Select();
+        }
+
         private IEnumerable<SelectionItemPattern> SelectionItems
         {
             get { return SelectionElements.Select(x => x.As<SelectionItemPattern>(SelectionItemPattern.Pattern)); }

data/ext/UiaDll/RAutomation.UIA/Extensions/Element.cs

@@ -1,4 +1,6 @@
-using System.Windows;
+using System;
+using System.Threading;
+using System.Windows;
 using System.Windows.Automation;
 
 namespace RAutomation.UIA.Extensions
@@ -101,6 +103,51 @@ namespace RAutomation.UIA.Extensions
             return (bool)automationElement.GetCurrentPropertyValue(AutomationElement.IsValuePatternAvailableProperty);
         }
 
+        public static bool CanScrollTo(this AutomationElement automationElement)
+        {
+            return (bool)automationElement.GetCurrentPropertyValue(AutomationElement.IsScrollItemPatternAvailableProperty);
+        }
+
+        public static ScrollItemPattern AsScrollItem(this AutomationElement automationElement)
+        {
+            return automationElement.As<ScrollItemPattern>(ScrollItemPatternIdentifiers.Pattern);
+        }
+
+        public static bool HasClickablePoint(this AutomationElement automationElement)
+        {
+            Point point;
+            return automationElement.TryGetClickablePoint(out point);
+        }
+
+        public static bool ScrollToIfPossible(this AutomationElement automationElement)
+        {
+            if (!automationElement.CanScrollTo())
+            {
+                return false;
+            }
+
+            if (!automationElement.HasClickablePoint())
+            {
+                automationElement.AsScrollItem().ScrollIntoView();
+                automationElement.WaitUntilClickable(3);
+            }
+
+            return true;
+        }
+
+        public static void WaitUntilClickable(this AutomationElement automationElement, int howManySeconds)
+        {
+            var then = DateTime.Now;
+            while (!automationElement.HasClickablePoint())
+            {
+                Thread.Sleep(1);
+                if ((DateTime.Now - then).Seconds > howManySeconds)
+                {
+                    throw new Exception(string.Format("Waited for more than {0} seconds to be able to click this", howManySeconds));
+                }
+            }
+        }
+
         public static ValuePattern AsValuePattern(this AutomationElement automationElement)
         {
             return (ValuePattern)automationElement.GetCurrentPattern(ValuePattern.Pattern);

data/ext/UiaDll/UiaDll/SelectListMethods.cpp

@@ -26,6 +26,11 @@ extern "C" {
 		StringHelper::CopyToUnmanagedString(selectList->Selection, selection, selectionLength);
 	}
 
+  __declspec ( dllexport ) int SelectList_Selections(const FindInformation& findInformation, const char* selections[]) {
+		auto selectList = gcnew SelectList(Locator::FindFor(findInformation));
+    return StringHelper::Copy(selectList->Selections, selections);
+  }
+
 	__declspec ( dllexport ) bool SelectList_ValueAt(const FindInformation& findInformation, const int whichItem, char* comboValue, const int comboValueSize) {
 		try {
 			auto selectList = gcnew SelectList(Locator::FindFor(findInformation));
@@ -37,6 +42,24 @@ extern "C" {
 		}
 	}
 
+  __declspec ( dllexport ) void SelectList_RemoveIndex(const FindInformation& findInformation, const int whichItem, char* errorInfo, const int errorInfoLength) {
+    try {
+      auto selectList = gcnew SelectList(Locator::FindFor(findInformation));
+      selectList->Remove(whichItem);
+    } catch(Exception^ e) {
+        StringHelper::Write(e, errorInfo, errorInfoLength);
+    }
+  }
+
+  __declspec ( dllexport ) void SelectList_RemoveValue(const FindInformation& findInformation, const char* whichItem, char* errorInfo, const int errorInfoLength) {
+    try {
+      auto selectList = gcnew SelectList(Locator::FindFor(findInformation));
+      selectList->Remove(gcnew String(whichItem));
+    } catch(Exception^ e) {
+        StringHelper::Write(e, errorInfo, errorInfoLength);
+    }
+  }
+
 	__declspec ( dllexport ) bool SelectList_SelectIndex(const FindInformation& findInformation, const int whichItem) {
 		try {
 			auto selectList = gcnew SelectList(Locator::FindFor(findInformation));

data/ext/UiaDll/UiaDll/StringHelper.cpp

@@ -8,6 +8,11 @@ void StringHelper::CopyToUnmanagedString(String^ source, char* destination, cons
 	Marshal::FreeHGlobal(unmanagedString);
 }
 
+void StringHelper::Write(Exception^ error, char* destination, const int destinationSize)
+{
+    StringHelper::CopyToUnmanagedString(error->Message, destination, destinationSize);
+}
+
 char* StringHelper::UnmanagedStringFrom(String^ source)
 {
 	const int numberOfBytes = source->Length + 1;

data/ext/UiaDll/UiaDll/StringHelper.h

@@ -5,6 +5,7 @@ ref class StringHelper
 {
 public:
 	static void CopyToUnmanagedString(String^ source, char* destination, const int destinationSize);
+  static void StringHelper::Write(Exception^ error, char* destination, const int destinationSize);
 	static char* UnmanagedStringFrom(String^ source);
 	static void FreeUp(const char* unmanagedStrings[], const int numberOfStrings);
   static int Copy(array<String^>^ strings, const char* unmanagedStrings[]);

data/ext/UiaDll/UiaDll/TableMethods.cpp

@@ -45,31 +45,49 @@ extern "C" {
 		}
 	}
 
-	__declspec ( dllexport ) void Table_SelectByIndex(const FindInformation& findInformation, const int dataItemIndex) {
+	__declspec ( dllexport ) void Table_SelectByIndex(const FindInformation& findInformation, const int dataItemIndex, char* errorInfo, const int errorInfoLength) {
 		try {
 			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
 			tableControl->SelectedIndex = dataItemIndex;
 		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
+      StringHelper::Write(e, errorInfo, errorInfoLength);
 		}
 	}
 
+  __declspec ( dllexport ) void Table_RemoveRowByIndex(const FindInformation& findInformation, const int dataItemIndex, char* errorInfo, const int errorInfoLength) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      tableControl->Remove(dataItemIndex);
+    } catch(Exception^ e) {
+      StringHelper::Write(e, errorInfo, errorInfoLength);
+    }
+  }
+
+  __declspec ( dllexport ) void Table_RemoveRowByValue(const FindInformation& findInformation, const char* dataItemValue, char* errorInfo, const int errorInfoLength) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      tableControl->Remove(gcnew String(dataItemValue));
+    } catch(Exception^ e) {
+      StringHelper::Write(e, errorInfo, errorInfoLength);
+    }
+  }
+
 	__declspec ( dllexport ) bool Table_IsSelectedByIndex(const FindInformation& findInformation, const int dataItemIndex) {
 		try {
 			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-			return tableControl->SelectedIndex == dataItemIndex;
+      return tableControl->IsRowSelected(dataItemIndex);
 		} catch(Exception^ e) {
 			Console::WriteLine(e->ToString());
       return false;
 		}
 	}
 
-	__declspec ( dllexport ) void Table_SelectByValue(const FindInformation& findInformation, const char* dataItemValue) {
+	__declspec ( dllexport ) void Table_SelectByValue(const FindInformation& findInformation, const char* dataItemValue, char* errorInfo, const int errorInfoLength) {
 		try {
 			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
 			tableControl->Value = gcnew String(dataItemValue);
 		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
+      StringHelper::Write(e, errorInfo, errorInfoLength);
 		}
 	}
 }

data/ext/WindowsForms/WindowsForms/AboutBox.Designer.cs

@@ -34,9 +34,12 @@
             this.infoTab = new System.Windows.Forms.TabPage();
             this.moreInfo = new System.Windows.Forms.TabPage();
             this.textBox1 = new System.Windows.Forms.TextBox();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.multiFruitListBox = new System.Windows.Forms.ListBox();
             this.tabControl.SuspendLayout();
             this.infoTab.SuspendLayout();
             this.moreInfo.SuspendLayout();
+            this.tabPage1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -62,6 +65,7 @@
             // 
             this.tabControl.Controls.Add(this.infoTab);
             this.tabControl.Controls.Add(this.moreInfo);
+            this.tabControl.Controls.Add(this.tabPage1);
             this.tabControl.Location = new System.Drawing.Point(12, 12);
             this.tabControl.Name = "tabControl";
             this.tabControl.SelectedIndex = 0;
@@ -99,6 +103,30 @@
             this.textBox1.TabIndex = 0;
             this.textBox1.Text = resources.GetString("textBox1.Text");
             // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.multiFruitListBox);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(543, 227);
+            this.tabPage1.TabIndex = 2;
+            this.tabPage1.Text = "Multi-Select ListBox";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // multiFruitListBox
+            // 
+            this.multiFruitListBox.FormattingEnabled = true;
+            this.multiFruitListBox.Items.AddRange(new object[] {
+            "Apple",
+            "Orange",
+            "Mango"});
+            this.multiFruitListBox.Location = new System.Drawing.Point(6, 6);
+            this.multiFruitListBox.Name = "multiFruitListBox";
+            this.multiFruitListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+            this.multiFruitListBox.Size = new System.Drawing.Size(159, 95);
+            this.multiFruitListBox.TabIndex = 15;
+            // 
             // AboutBox
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -120,6 +148,7 @@
             this.infoTab.PerformLayout();
             this.moreInfo.ResumeLayout(false);
             this.moreInfo.PerformLayout();
+            this.tabPage1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -132,6 +161,8 @@
         private System.Windows.Forms.TabPage infoTab;
         private System.Windows.Forms.TabPage moreInfo;
         private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.ListBox multiFruitListBox;
 
     }
 }

data/ext/WindowsForms/WindowsForms/DataEntryForm.Designer.cs

@@ -47,6 +47,7 @@
             this.label1 = new System.Windows.Forms.Label();
             this.maskedTextBox2 = new System.Windows.Forms.MaskedTextBox();
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.toggleMultiSelect = new System.Windows.Forms.Button();
             this.groupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.SuspendLayout();
@@ -164,11 +165,22 @@
             this.numericUpDown1.Size = new System.Drawing.Size(120, 20);
             this.numericUpDown1.TabIndex = 15;
             // 
+            // toggleMultiSelect
+            // 
+            this.toggleMultiSelect.Location = new System.Drawing.Point(12, 41);
+            this.toggleMultiSelect.Name = "toggleMultiSelect";
+            this.toggleMultiSelect.Size = new System.Drawing.Size(95, 23);
+            this.toggleMultiSelect.TabIndex = 16;
+            this.toggleMultiSelect.Text = "Toggle Multi";
+            this.toggleMultiSelect.UseVisualStyleBackColor = true;
+            this.toggleMultiSelect.Click += new System.EventHandler(this.toggleMultiSelect_Click);
+            // 
             // DataEntryForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(724, 474);
+            this.Controls.Add(this.toggleMultiSelect);
             this.Controls.Add(this.numericUpDown1);
             this.Controls.Add(this.maskedTextBox2);
             this.Controls.Add(this.label1);
@@ -201,5 +213,6 @@
         private System.Windows.Forms.ColumnHeader columnState;
         private System.Windows.Forms.MaskedTextBox maskedTextBox2;
         private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.Button toggleMultiSelect;
     }
 }