rautomation 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e50cb69e80b4659265b0edfc11904e064efee3b
-  data.tar.gz: 6ea9b5a0d4cfc8c2c43ddd995c7a0c8b07ccff7e
+  metadata.gz: 9f790814402e5dff056890bfd0bc89e90025b5ab
+  data.tar.gz: f0a96181d6654fd874cfa2e7c05da15f139bdf56
 SHA512:
-  metadata.gz: 6bbe2f8ed80c1dff85044ce04fba2e62fac3489045d4cadaf792322f70eac4a9f06e08a4d86e6ec0e3afabc9ac6559e166f75397976b1af1f3ed76874976e88f
-  data.tar.gz: 2400713a652d47652e93249c2a38dcd8e809f46a619ea986762bada8d561f13e2eed3dff293eb2fc84020654efdf728599492a431026a6729b97543bd545578f
+  metadata.gz: c258b23e4d6b47cc5708590cbdf36a991ce51c30924e2d547f88066a097a2585447359daef244e34153c350bb8577e0287d8e9fc15acbc82575edde0e36931d8
+  data.tar.gz: b74d867f6e09501da80d26cc1852145b8206fc1b21d46165cd92cd9c7c96589cdb887f4298629e6779c0ad16ab2c616cc7e92263e72d9ca2eb94f77de89d4deb

data/.gitignore

@@ -33,3 +33,4 @@ ipch
 *.user
 *.opensdf
 _ReSharper*/
+packages/

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    rautomation (0.13.0)
+    rautomation (0.14.0)
       ffi
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
     ffi (1.9.0-x86-mingw32)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     yard (0.8.6.1)
 
 PLATFORMS
@@ -26,5 +26,5 @@ PLATFORMS
 DEPENDENCIES
   rake
   rautomation!
-  rspec (~> 2.3)
+  rspec (~> 2.14)
   yard

data/History.rdoc

@@ -1,3 +1,14 @@
+== 0.14.0
+
+=== MsUia adapter
+
+  * Add SelectList#select and SelectList#clear.
+  * Add Table#select and Table#clear.
+  * Add Table#selected_rows.
+  * Improve performance of table Row lookups.
+  * SelectList#options accepts :index and :text (Regexp or String).
+  * Window#child in ms_uia works for popup windows as well.
+
 == 0.13.0
 
 === MsUia adapter

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.14.0

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

@@ -26,6 +26,11 @@ namespace RAutomation.UIA.Controls
             set { Select(value); }
         }
 
+        public int[] SelectedIndexes
+        {
+            get { return DataItems.IndexesOf(x => x.AsSelectionItem().Current.IsSelected); }
+        }
+
         public bool IsRowSelected(int dataItemIndex)
         {
             return DataItems.ElementAt(dataItemIndex).AsSelectionItem().Current.IsSelected;
@@ -71,6 +76,11 @@ namespace RAutomation.UIA.Controls
             get { return TableOrListItems.Select(x => x.Current.Name).ToArray(); }
         }
 
+        public void SingleSelect(int value)
+        {
+            DataItems.ElementAt(value).AsSelectionItem().Select();
+        }
+
         private void Select(int value)
         {
             var selectionItem = DataItems.ElementAt(value).AsSelectionItem();

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

@@ -49,6 +49,19 @@ namespace RAutomation.UIA.Extensions
             return -1;
         }
 
+        public static int[] IndexesOf<T>(this IEnumerable<T> items, Func<T, bool> trueCondition)
+        {
+            var indexes = new List<int>();
+            var foundIndex = 0;
+            foreach (var item in items)
+            {
+                if (trueCondition(item)) indexes.Add(foundIndex);
+                ++foundIndex;
+            }
+
+            return indexes.ToArray();
+        }
+
         public static void ForEach<T>(this IEnumerable<T> items, Action<T> doIt)
         {
             foreach (var item in items)

data/ext/UiaDll/UiaDll/ArrayHelper.cpp

@@ -0,0 +1,14 @@
+#include "StdAfx.h"
+#include "ArrayHelper.h"
+
+
+int ArrayHelper::Copy(array<int, 1>^ source, int destination[])
+{
+  if( NULL != destination ) {
+    auto index = 0;
+    for each(auto value in source) {
+      destination[index++] = value;
+    }
+  }
+  return source->Length;
+}

data/ext/UiaDll/UiaDll/ArrayHelper.h

@@ -0,0 +1,7 @@
+#pragma once
+ref class ArrayHelper
+{
+public:
+  static int Copy(array<int>^ source, int destination[]);
+};
+

data/ext/UiaDll/UiaDll/TableMethods.cpp

@@ -1,58 +1,73 @@
 #include "stdafx.h"
 #include "Locator.h"
+#include "ArrayHelper.h"
 #include "StringHelper.h"
 
 using namespace RAutomation::UIA::Controls;
 
 extern "C" {
 
-	__declspec ( dllexport ) int Table_GetHeaders(const FindInformation& findInformation, const char* headers[]) {
-		auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-		return StringHelper::Copy(tableControl->Headers, headers);
-	}
+  __declspec ( dllexport ) int Table_GetHeaders(const FindInformation& findInformation, const char* headers[]) {
+    auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+    return StringHelper::Copy(tableControl->Headers, headers);
+  }
+
+  __declspec ( dllexport ) int Table_GetValues(const FindInformation& findInformation, const char* values[]) {
+    auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+    return StringHelper::Copy(tableControl->Values, values);
+  }
 
-	__declspec ( dllexport ) int Table_GetValues(const FindInformation& findInformation, const char* values[]) {
-		auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-		return StringHelper::Copy(tableControl->Values, values);
-	}
+  __declspec ( dllexport ) int Table_GetSelectedIndexes(const FindInformation& findInformation, int selectedIndexes[]) {
+    auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+    return ArrayHelper::Copy(tableControl->SelectedIndexes, selectedIndexes);
+  }
 
-	__declspec ( dllexport ) int Table_RowCount(const FindInformation& findInformation) {
-		try {
-			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-			return tableControl->RowCount;
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
+  __declspec ( dllexport ) int Table_RowCount(const FindInformation& findInformation) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      return tableControl->RowCount;
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
       return 0;
-		}
-	}
+    }
+  }
 
-	__declspec ( dllexport ) bool Table_CoordinateIsValid(const FindInformation& findInformation, const int whichItemIndex, const int whichColumnIndex) {
-		try {
-			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-			return tableControl->Exists(whichItemIndex, whichColumnIndex);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-			return false;
-		}
-	}
+  __declspec ( dllexport ) bool Table_CoordinateIsValid(const FindInformation& findInformation, const int whichItemIndex, const int whichColumnIndex) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      return tableControl->Exists(whichItemIndex, whichColumnIndex);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+      return false;
+    }
+  }
+
+  __declspec ( dllexport ) void Table_ValueAt(const FindInformation& findInformation, const int row, const int column, char *foundValue, const int foundValueLength) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      StringHelper::CopyToUnmanagedString(tableControl->ValueAt(row, column), foundValue, foundValueLength);
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
+    }
+  }
 
-	__declspec ( dllexport ) void Table_ValueAt(const FindInformation& findInformation, const int row, const int column, char *foundValue, const int foundValueLength) {
-		try {
-			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
-			StringHelper::CopyToUnmanagedString(tableControl->ValueAt(row, column), foundValue, foundValueLength);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
-		}
-	}
+  __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) {
+      StringHelper::Write(e, errorInfo, errorInfoLength);
+    }
+  }
 
-	__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) {
+  __declspec ( dllexport ) void Table_SingleSelectByIndex(const FindInformation& findInformation, const int dataItemIndex, char* errorInfo, const int errorInfoLength) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+      tableControl->SingleSelect(dataItemIndex);
+    } catch(Exception^ e) {
       StringHelper::Write(e, errorInfo, errorInfoLength);
-		}
-	}
+    }
+  }
 
   __declspec ( dllexport ) void Table_RemoveRowByIndex(const FindInformation& findInformation, const int dataItemIndex, char* errorInfo, const int errorInfoLength) {
     try {
@@ -72,22 +87,22 @@ extern "C" {
     }
   }
 
-	__declspec ( dllexport ) bool Table_IsSelectedByIndex(const FindInformation& findInformation, const int dataItemIndex) {
-		try {
-			auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
+  __declspec ( dllexport ) bool Table_IsSelectedByIndex(const FindInformation& findInformation, const int dataItemIndex) {
+    try {
+      auto tableControl = gcnew TableControl(Locator::FindFor(findInformation));
       return tableControl->IsRowSelected(dataItemIndex);
-		} catch(Exception^ e) {
-			Console::WriteLine(e->ToString());
+    } catch(Exception^ e) {
+      Console::WriteLine(e->ToString());
       return false;
-		}
-	}
+    }
+  }
 
-	__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) {
+  __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) {
       StringHelper::Write(e, errorInfo, errorInfoLength);
-		}
-	}
+    }
+  }
 }

data/ext/UiaDll/UiaDll/UiaDll.vcxproj

@@ -80,6 +80,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="ArrayHelper.h" />
     <ClInclude Include="Locator.h" />
     <ClInclude Include="DynamicAssemblyResolver.h" />
     <ClInclude Include="MenuItemSelector.h" />
@@ -90,6 +91,7 @@
     <ClInclude Include="UiaDll.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ArrayHelper.cpp" />
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="Locator.cpp" />
     <ClCompile Include="ControlMethods.cpp" />

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

@@ -39,6 +39,9 @@
     <ClInclude Include="MenuItemSelector.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ArrayHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="UiaDll.cpp">
@@ -89,6 +92,9 @@
     <ClCompile Include="SpinnerMethods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ArrayHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

data/ext/WindowsForms/.nuget/NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>

data/ext/WindowsForms/.nuget/NuGet.targets

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">false</RequireRestoreConsent>
+        
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+    
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig>packages.config</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+        
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+        
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+        
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+              
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+              
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+    
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>

data/ext/WindowsForms/WindowsForms.sln

@@ -1,8 +1,15 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsForms", "WindowsForms\WindowsForms.csproj", "{79C33EDA-58C4-41EF-93DC-BA679895BD43}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C2B59FF1-0EE8-457F-A808-3B558459DA57}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

data/ext/WindowsForms/WindowsForms/DataGridView.cs

@@ -1,7 +1,7 @@
 using System;
-using System.Linq;
 using System.Windows.Forms;
 using FizzWare.NBuilder;
+using UIA.Extensions;
 
 namespace WindowsForms
 {
@@ -10,6 +10,7 @@ namespace WindowsForms
         public DataGridView()
         {
             InitializeComponent();
+	        dataGridView1.AsTable();
         }
 
         public class Person

data/ext/WindowsForms/WindowsForms/WindowsForms.csproj

@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -47,9 +49,8 @@
     <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 Include="UIA.Extensions">
+      <HintPath>..\packages\UIA.Extensions.1.0.5.0\lib\net35\UIA.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="UIAutomationClient" />
     <Reference Include="UIAutomationProvider" />
@@ -123,6 +124,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -135,6 +137,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.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">

data/ext/WindowsForms/WindowsForms/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="UIA.Extensions" version="1.0.5.0" targetFramework="net40-Client" />
+</packages>

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

@@ -168,20 +168,13 @@ module RAutomation
           def control_hwnd(window_hwnd, locators)
             case
               when locators[:id]
-                hwnd = UiaDll.cached_hwnd(UiaDll::SearchCriteria.from_locator(window_hwnd, locators))
-                raise UnknownElementException, "#{locators[:id]} does not exist" if hwnd == 0
-                hwnd
+                UiaDll.cached_hwnd(UiaDll::SearchCriteria.from_locator(window_hwnd, locators))
               when locators[:point]
-                hwnd = UiaDll::handle_from_point(*locators[:point])
-                raise UnknownElementException, "#{locators[:point]} does not exist" if hwnd == 0
-                hwnd
+                UiaDll::handle_from_point(*locators[:point])
               else
-                hwnd = find_hwnd(locators, window_hwnd) do |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)
-                hwnd
             end
           end
 

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

@@ -11,8 +11,8 @@ module RAutomation
 
           def initialize(select_list, text, index)
             @select_list = select_list
-            @text        = text
-            @index       = index
+            @text = text
+            @index = index
           end
 
           def selected?
@@ -28,22 +28,30 @@ module RAutomation
             UiaDll::remove_from_selection @select_list.search_information, @index
           end
 
+          def self.locators_match?(locators, item)
+            locators.all? do |locator, value|
+              return item.text =~ value if value.is_a? Regexp
+              return item.send(locator) == value
+            end
+          end
+
           alias_method :set, :select
         end
 
-        def options(options = {})
-          items = []
+        def option(locator)
+          options(locator).first
+        end
 
-          select_options = UiaDll::select_options(search_information)
-          select_options.each_with_index do |item, item_no|
-            if options[:text]
-              items.push(SelectListOption.new(self, item, item_no)) if options[:text] == item
-            else
-              items.push(SelectListOption.new(self, item, item_no))
-            end
-          end
+        def options(locator = {})
+          all_options.select { |item| SelectListOption.locators_match? locator, item }
+        end
+
+        def select(locator = {})
+          options(locator).each(&:select)
+        end
 
-          items
+        def clear(locator = {})
+          options(locator).each(&:clear)
         end
 
         def value
@@ -54,14 +62,6 @@ module RAutomation
           UiaDll::selections(search_information)
         end
 
-        def option(options)
-          UiaDll::select_options(search_information).each_with_index do |item, item_no|
-            return SelectListOption.new(self, item, item_no) if options[:text] == item
-          end
-
-          nil
-        end
-
         def exist?
           super && matches_type?(Constants::UIA_COMBOBOX_CONTROL_TYPE)
         end
@@ -69,11 +69,16 @@ module RAutomation
         alias_method :exists?, :exist?
 
         private
-
         def item_count
           UiaDll::select_list_count(search_information)
         end
 
+        def all_options
+          UiaDll::select_options(search_information).each_with_index.map do |item, index|
+            SelectListOption.new(self, item, index)
+          end
+        end
+
       end
     end
   end

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

@@ -41,8 +41,9 @@ module RAutomation
           cells(locators).first
         end
 
-        def initialize(window, locators)
-          @search_information = window.search_information
+        def initialize(table, locators)
+          @table = table
+          @search_information = table.search_information
           @locators = extract(locators)
         end
 
@@ -67,7 +68,7 @@ module RAutomation
         end
 
         def exists?
-          UiaDll::table_coordinate_valid?(search_information, @locators[:index])
+          @locators[:index].between? 0, @table.row_count - 1
         end
 
         def self.locators_match?(locators, item)
@@ -98,6 +99,18 @@ module RAutomation
           end
         end
 
+        def select(locators={})
+          rows(locators).each(&:select)
+        end
+
+        def clear(locators={})
+          rows(locators).each(&:clear)
+        end
+
+        def selected_rows
+          UiaDll.table_selected_indexes(search_information).map {|index| Row.new(self, index: index) }
+        end
+
         def strings
           headers = UiaDll.table_headers(search_information)
           values = UiaDll.table_values(search_information)

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

@@ -94,7 +94,7 @@ module RAutomation
           def data=(value)
             case how
               when :hwnd
-                self[:data][:int_data] = value
+                self[:data][:int_data] = value || 0 # cannot accept nil
               when :id, :value
                 self[:data][:string_data] = value
               when :point
@@ -302,6 +302,8 @@ module RAutomation
                         [SearchCriteria.by_ref, :pointer], :int
         attach_function :Table_GetValues,
                         [SearchCriteria.by_ref, :pointer], :int
+        attach_function :Table_GetSelectedIndexes,
+                        [SearchCriteria.by_ref, :pointer], :int
         attach_function :table_row_count, :Table_RowCount,
                         [SearchCriteria.by_ref], :int
         attach_function :Table_CoordinateIsValid,
@@ -310,6 +312,8 @@ module RAutomation
                         [SearchCriteria.by_ref, :int, :int, :pointer, :int], :void
         attach_function :Table_SelectByIndex,
                         [SearchCriteria.by_ref, :int, :pointer, :int], :void
+        attach_function :Table_SingleSelectByIndex,
+                        [SearchCriteria.by_ref, :int, :pointer, :int], :void
         attach_function :Table_SelectByValue,
                         [SearchCriteria.by_ref, :string, :pointer, :int], :void
         attach_function :table_row_is_selected, :Table_IsSelectedByIndex,
@@ -319,6 +323,10 @@ module RAutomation
         attach_function :Table_RemoveRowByValue,
                         [SearchCriteria.by_ref, :string, :pointer, :int], :void
 
+        def self.table_selected_indexes(search_information)
+          integers_from(:Table_GetSelectedIndexes, search_information)
+        end
+
         def self.table_select(search_information, which_item)
           case which_item
             when Integer
@@ -328,6 +336,10 @@ module RAutomation
           end
         end
 
+        def self.table_single_select(search_information, which_item)
+          can_throw(:Table_SingleSelectByIndex, search_information, which_item)
+        end
+
         def self.table_value_at(search_information, row, column=0)
           string_from(:Table_ValueAt, search_information, row, column)
         end
@@ -381,6 +393,13 @@ module RAutomation
         end
 
         private
+        def self.integers_from(method, search_information)
+          item_count = send method, search_information, nil
+          pointer = FFI::MemoryPointer.new :pointer, item_count
+          send method, search_information, pointer
+          pointer.read_array_of_int(item_count)
+        end
+
         def self.strings_from(method, hwnd)
           string_count = send method, hwnd, nil
           pointer = FFI::MemoryPointer.new :pointer, string_count

data/rautomation.gemspec

@@ -27,7 +27,7 @@ RAutomation provides:
   s.require_paths = ["lib"]  
 
   s.add_runtime_dependency("ffi")
-  s.add_development_dependency("rspec", "~>2.3")
+  s.add_development_dependency("rspec", "~> 2.14")
   s.add_development_dependency("rake")
   s.add_development_dependency("yard")
 end

data/spec/adapter/ms_uia/select_list_spec.rb

@@ -15,7 +15,7 @@ describe 'MsUia::SelectList', :if => SpecHelper.adapter == :ms_uia do
     about.select_list(:id => 'multiFruitListBox')
   end
 
-  it '#fruits_combo' do
+  it '#select_list' do
     fruits_combo.should exist
 
     RAutomation::Window.wait_timeout = 0.1
@@ -29,37 +29,43 @@ describe 'MsUia::SelectList', :if => SpecHelper.adapter == :ms_uia do
     fruits_combo.should exist
   end
 
-  it '#options' do
-    fruits_combo.options.size.should == 5
+  context 'SelectListOption' do
+    it '#selected? & #select' do
+      fruits_combo.options(:text => 'Apple')[0].should_not be_selected
+      fruits_combo.options(:text => 'Apple')[0].select.should be_true
+      fruits_combo.options(:text => 'Apple')[0].should be_selected
+    end
 
-    expected_options = ['Apple', 'Caimito', 'Coconut', 'Orange', 'Passion Fruit']
-    fruits_combo.options.map {|option| option.text}.should == expected_options
-  end
+    it '#value' do
 
-  it '#selected? & #select' do
-    fruits_combo.options(:text => 'Apple')[0].should_not be_selected
-    fruits_combo.options(:text => 'Apple')[0].select.should be_true
-    fruits_combo.options(:text => 'Apple')[0].should be_selected
-  end
+      #default empty state
+      fruits_combo.value.should == ''
 
-  it '#value' do
+      fruits_combo.options(:text => 'Apple')[0].select
+      fruits_combo.value.should == 'Apple'
 
-    #default empty state
-    fruits_combo.value.should == ''
+      fruits_combo.options(:text => 'Caimito')[0].select
+      fruits_combo.value.should == 'Caimito'
+    end
 
-    fruits_combo.options(:text => 'Apple')[0].select
-    fruits_combo.value.should == 'Apple'
+    it 'enabled/disabled' do
+      fruits_combo.should be_enabled
+      fruits_combo.should_not be_disabled
 
-    fruits_combo.options(:text => 'Caimito')[0].select
-    fruits_combo.value.should == 'Caimito'
+      disabled_combo.should_not be_enabled
+      disabled_combo.should be_disabled
+    end
   end
 
-  it 'enabled/disabled' do
-    fruits_combo.should be_enabled
-    fruits_combo.should_not be_disabled
+  it '#select' do
+    multi_fruits.select text: /ng/
+    multi_fruits.values.should eq(['Orange', 'Mango'])
+  end
 
-    disabled_combo.should_not be_enabled
-    disabled_combo.should be_disabled
+  it '#clear' do
+    multi_fruits.select # select all
+    multi_fruits.clear text: 'Orange'
+    multi_fruits.values.should eq(['Apple', 'Mango'])
   end
 
   it '#values' do
@@ -73,10 +79,19 @@ describe 'MsUia::SelectList', :if => SpecHelper.adapter == :ms_uia do
 
   it '#option' do
     fruits_combo.option(:text => 'Apple').should_not be_selected
-    fruits_combo.option(:text => 'Apple').set
+    fruits_combo.option(:index => 0).set
     fruits_combo.option(:text => 'Apple').should be_selected
   end
 
+  it '#options' do
+    fruits_combo.options.size.should == 5
+    fruits_combo.options.map(&:text).should eq(['Apple', 'Caimito', 'Coconut', 'Orange', 'Passion Fruit'])
+
+    fruits_combo.options(text: 'Apple').map(&:text).should eq ['Apple']
+    fruits_combo.options(text: /Ap{2}le/).map(&:text).should eq ['Apple']
+    fruits_combo.options(index: 0).map(&:text).should eq ['Apple']
+  end
+
   it 'cannot select anything on a disabled select list' do
     expect { disabled_combo.option(:text => 'Apple').set }.to raise_error
   end

data/spec/adapter/ms_uia/table_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
-describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
+describe 'MsUia::Table', :if => SpecHelper.adapter == :ms_uia do
+  let(:window) { RAutomation::Window.new(:title => "MainFormWindow") }
   let(:data_entry) { RAutomation::Window.new(:title => "DataEntryForm") }
+  let(:data_grid_view) { window.button(value: 'Data Grid View').click {true}; RAutomation::Window.new(title: /DataGridView/) }
+  let(:large_grid) { data_entry.close; data_grid_view.table(id: 'dataGridView1') }
   let(:table) { data_entry.table(:id => "personListView") }
   let(:toggle_multi_select) { data_entry.button(:value => 'Toggle Multi').click { true } }
 
   before :each do
-    window = RAutomation::Window.new(:title => "MainFormWindow")
     window.button(:value => "Data Entry Form").click { RAutomation::Window.new(:title => "DataEntryForm").exists? }
   end
 
@@ -42,11 +44,42 @@ describe "MsUia::Table", :if => SpecHelper.adapter == :ms_uia do
     table.row_count.should eq(2)
   end
 
+  it '#select' do
+    large_grid.select value: /^FirstName[1-9]$/
+    first_nine = large_grid.rows.take(9)
+    expect(first_nine.count).to be 9
+    first_nine.should be_all(&:selected?)
+  end
+
+  it '#clear' do
+    first_three = large_grid.rows.take(3)
+    next_six = large_grid.rows.take_while { |r| r.index.between?(3, 9) }
+    large_grid.select value: /^FirstName[1-9]$/
+
+    large_grid.clear value: /^FirstName[1-3]$/
+
+    first_three.all?(&:selected?).should be_false
+    next_six.all?(&:selected?).should be_true
+  end
+
+  it '#selected_rows' do
+    large_grid.select value: /^FirstName[1-5]$/
+    large_grid.selected_rows.map(&:index).should eq([0, 1, 2, 3, 4])
+  end
+
   context "#rows" do
     it "has rows" do
       table.rows.size.should eq 2
     end
 
+    it 'are quick to find' do
+      large_grid.row_count.should eq(51)
+
+      start = Time.now
+      large_grid.row(index: 50).should exist
+      (Time.now - start).should be < 1.5
+    end
+
     it "have values" do
       table.rows.map(&:value).should eq ["John Doe", "Anna Doe"]
     end

data/spec/adapter/ms_uia/window_spec.rb

@@ -3,8 +3,6 @@ require "spec_helper"
 describe "MsUia::Window", :if => SpecHelper.adapter == :ms_uia do
   let(:window) {RAutomation::Window.new(:title => /MainFormWindow/i)}
 
-
-
   it "move and click" do
     #window = RAutomation::Window.new(:title => /MainFormWindow/i)
                             window.maximize
@@ -12,7 +10,6 @@ describe "MsUia::Window", :if => SpecHelper.adapter == :ms_uia do
     sleep 1
     window.click_mouse
     sleep 1
-
   end
 
   context "#send_keys" do

data/spec/window_spec.rb

@@ -130,14 +130,20 @@ describe RAutomation::Window do
             to_not raise_exception
   end
 
-  it "#child", :if => [:win_32, :ms_uia].include?(SpecHelper.adapter) do
-    window = RAutomation::Window.new(:title => SpecHelper::DATA[:window1_full_title])
-    window.should exist
-
-    # buttons are windows too. so let's find the button for now
-    child = window.child(:title => /About/i)
-    child.should exist
-    child.title.should == "&About"
-    child.adapter.should == SpecHelper.adapter
+  context '#child', :if => [:win_32, :ms_uia].include?(SpecHelper.adapter) do
+    let(:window) { RAutomation::Window.new(:title => SpecHelper::DATA[:window1_full_title]) }
+
+    it 'immediate children' do
+      # buttons are windows too. so let's find the button for now
+      child = window.child(:title => '&About')
+      child.should exist
+      child.title.should == "&About"
+      child.adapter.should == SpecHelper.adapter
+    end
+
+    it 'popups' do
+      window.button(:title => '&About').click { true }
+      window.child(:title => 'About').should be_visible
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rautomation
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,8 @@ files:
 - ext/UiaDll/RAutomation.UIA/Properties/AutomationProperties.cs
 - ext/UiaDll/RAutomation.UIA/RAutomation.UIA.csproj
 - ext/UiaDll/UiaDll.sln
+- ext/UiaDll/UiaDll/ArrayHelper.cpp
+- ext/UiaDll/UiaDll/ArrayHelper.h
 - ext/UiaDll/UiaDll/AssemblyInfo.cpp
 - ext/UiaDll/UiaDll/ControlMethods.cpp
 - ext/UiaDll/UiaDll/DynamicAssemblyResolver.cpp
@@ -149,6 +151,9 @@ files:
 - ext/UiaDll/UiaDll/stdafx.cpp
 - ext/UiaDll/UiaDll/stdafx.h
 - ext/UiaDll/UiaDll/targetver.h
+- ext/WindowsForms/.nuget/NuGet.Config
+- ext/WindowsForms/.nuget/NuGet.exe
+- ext/WindowsForms/.nuget/NuGet.targets
 - ext/WindowsForms/WindowsForms.sln
 - ext/WindowsForms/WindowsForms/AboutBox.Designer.cs
 - ext/WindowsForms/WindowsForms/AboutBox.cs
@@ -178,6 +183,7 @@ files:
 - ext/WindowsForms/WindowsForms/UIA.Extensions.dll
 - ext/WindowsForms/WindowsForms/ValueMonthCalendar.cs
 - ext/WindowsForms/WindowsForms/WindowsForms.csproj
+- ext/WindowsForms/WindowsForms/packages.config
 - lib/rautomation.rb
 - lib/rautomation/adapter/autoit.rb
 - lib/rautomation/adapter/autoit/button.rb