uia 0.7 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c966c5e58a5c2b30fad2f966be8e24a881d4f309
-  data.tar.gz: 324ddfa069b36dd359f9f794cd639f8aab3dfef0
+SHA256:
+  metadata.gz: f8c2b4d015985e4d591a9896fa2cee66e60b5eb29a6f774accc23094d4ec1429
+  data.tar.gz: '08f1ae75dcf5b10a3e59f077c8ead8bb9e81834f61b1eebf4838606569c006ad'
 SHA512:
-  metadata.gz: 4eae7ba71eea61ab05e842e03c61537d6893d94052fa0e514987e51b977159535cfb3ea7096c3778163e4370317f4f1ea145b4f61c14d7dd254559c354b48a8d
-  data.tar.gz: ab750c1795c1e1bf7c43444526f1d6198b703396e0563224ffddf2e4f95e5c75a135813a2dba1e1b4bdacf29f17c8a57dfbf03c94aeb5a062102be61d48e4b5c
+  metadata.gz: da1e59adbead52a98088604751feb2ae5aa2c0fe64ddb1dc02a9794427992a0e0cbb52fa6adddc59cb3a15a57047fe0c1f8b22dc8882b7ff8aa09f76e31bd057
+  data.tar.gz: ac970d4aeb30e37182311295d4a70ce7f9c161422eae8b7c7078a98b6ecefcc37df913d8be65307bf6e790854960ff9c44cf1310d358ef1fb3a27c4e32069f28

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spec/app/src"]
-	path = spec/app/src
-	url = git://github.com/leviwilson/mohawk-testing-app
+    path = spec/app/src
+    url = https://github.com/leviwilson/mohawk-testing-app.git

data/ChangeLog

@@ -1,35 +1,40 @@
-===	Version 0.7	/ 2019-01-22
-*	Changes
-		*	Drag events now send an intermediate MouseMove event
-
-===	Version 0.6	/ 2014-11-14
-*	Changes
-		*	Loosened the ffi dependency to ~> 1.9.4
-
-===	Version 0.5	/ 2014-05-26
-*	Bug Fixes
-		*	fixed issue #5 where finding by runtime_id was not working on Windows 8
-		machines
-
-===	Version 0.4.4	/	2014-05-23
-*	Enhancements
-		*		modified how it uses the runtime_id to locate an element to use the
-		first found handle section, rather than the last
-
-===	Version 0.4.3	/	2014-05-23
-*	Enhancements
-		*		improved the speed at which you can locate an element by runtime_id
-
-===	Version 0.4.2 / 2014-05-21
-*	Enhancements
-		*		Exceptions on the .NET side of things now include stack trace
-		information
-		*		Better errors when elements that are expected to exist are no longer
-		there
-
-*	Bug Fixes
-		*		Fixes a potential memory leak if an ElementNotAvailableException
-		occurs when grabbing elements
+=== Version 0.8 / 2021-01-19
+*    Changes
+    *    Bumped gem dependencies
+    *    Removed albacore
+
+=== Version 0.7 / 2019-01-22
+*    Changes
+    *    Drag events now send an intermediate MouseMove event
+
+=== Version 0.6 / 2014-11-14
+*    Changes
+    *    Loosened the ffi dependency to ~> 1.9.4
+
+=== Version 0.5 / 2014-05-26
+*    Bug Fixes
+    *    fixed issue #5 where finding by runtime_id was not working on Windows 8
+    machines
+
+=== Version 0.4.4 / 2014-05-23
+*    Enhancements
+    *    modified how it uses the runtime_id to locate an element to use the
+    first found handle section, rather than the last
+
+=== Version 0.4.3 / 2014-05-23
+*    Enhancements
+    *    improved the speed at which you can locate an element by runtime_id
+
+=== Version 0.4.2 / 2014-05-21
+*    Enhancements
+    *    Exceptions on the .NET side of things now include stack trace
+    information
+    *    Better errors when elements that are expected to exist are no longer
+    there
+
+*    Bug Fixes
+    *    Fixes a potential memory leak if an ElementNotAvailableException
+    occurs when grabbing elements
 
 === Version 0.4.1 / 2014-05-14
 *   Enhancements
@@ -83,84 +88,84 @@
     *   changed #click to be clickable point only
     *   added #click_center to try to click in the bounding_rectangle
 
-===	Version 0.0.9 / 2014-02-06
-*	Enhancements
-	*	Element#focused? and Element#focus
-	*	Element#bounding_rectangle
-	*	Selection#selected_items for multi-select
-	*	#focus will try multiple times to focus an element before it gives up
-	*	#click will attempt to use the bounding_rectangle if there is no
-	"clickable point"
+===    Version 0.0.9 / 2014-02-06
+*    Enhancements
+    *    Element#focused? and Element#focus
+    *    Element#bounding_rectangle
+    *    Selection#selected_items for multi-select
+    *    #focus will try multiple times to focus an element before it gives up
+    *    #click will attempt to use the bounding_rectangle if there is no
+    "clickable point"
 
 === Version 0.0.8 / 2013-12-02
-*	Enhancements
-	*	Uia#find_element and Element#find can locate by :title
-	*	Element#send_keys
-	*	Window#close
-	*	TextPattern support to get / set the text
+*    Enhancements
+    *    Uia#find_element and Element#find can locate by :title
+    *    Element#send_keys
+    *    Window#close
+    *    TextPattern support to get / set the text
 
-*	Bug Fixes
-	*	Fix issue with selecting cells in a table
+*    Bug Fixes
+    *    Fix issue with selecting cells in a table
 
 === Version 0.0.7.3 / 2013-11-02
-*	Enhancements
-	*	Element#visible?
-	*	added support for RangeValuePattern
+*    Enhancements
+    *    Element#visible?
+    *    added support for RangeValuePattern
 
 === Version 0.0.7.2 / 2013-11-02
-*	Enhancements
-	*	Element#find can specify the scope of the search
+*    Enhancements
+    *    Element#find can specify the scope of the search
 
 === Version 0.0.7.1 / 2013-11-01
-*	Bug Fixes
-	*	Fixes issue with ComboBox controls for Selection#selection_items
+*    Bug Fixes
+    *    Fixes issue with ComboBox controls for Selection#selection_items
 
 === Version 0.0.7 / 2013-11-01
-*	Enhancements
-	*	added a base implementation for the Window pattern
-	*	added support for WindowPattern, TablePattern and TableItemPattern
-	*	Element#as raises UnsupportedPattern if the element does not implement it
-	*	added an Element#select method to filter descendants by:
-		-	pattern
-		-	name 
-		-	id
-
-*	Bug Fixes
-	*	modified ffi calls that return Element arrays to be individually GC'd.
-	This prevents FFI::ManagedStruct from being taken out from underneath you
+*    Enhancements
+    *    added a base implementation for the Window pattern
+    *    added support for WindowPattern, TablePattern and TableItemPattern
+    *    Element#as raises UnsupportedPattern if the element does not implement it
+    *    added an Element#select method to filter descendants by:
+        -    pattern
+        -    name 
+        -    id
+
+*    Bug Fixes
+    *    modified ffi calls that return Element arrays to be individually GC'd.
+    This prevents FFI::ManagedStruct from being taken out from underneath you
 
 === Version 0.0.6.1 / 2013-10-30
 * Bug Fixes
-	*	Fixed issue when finding root children by RegEx initially
-	*	all Find methods consistently return Element classes
+    *    Fixed issue when finding root children by RegEx initially
+    *    all Find methods consistently return Element classes
 
 === Version 0.0.6 / 2013-10-22
-*	Enhancements
-	* Have implemented the following patterns:
-		*	ExpandCollapse
-		*	Invoke
-		*	Selection
-		*	SelectionItem
-		*	Toggle
-		*	Value
-	*	Element can find their descendants by :id or :name
-	*	Can search for top-level elements with Regex
-	*	Elements can be refreshed
-	*	Moved Uia methods to be class-level (i.e. Uia.find_element rather than
-	including Uia)
-
-===	Version 0.0.5.1 / 2013-10-16
-*	Enhancements
-	*	reduced the size of the gem package by excluding gmock and gtest
-
-===	Version 0.0.5 / 2013-10-16
-
-*	Enhancements
-	*	Pushed #find_element into the Uia module
-	*	Can locate elements by :id, :handle, :runtime_pid and :pid
-	*	Element now knows about :id,:control_type, :patterns, :handle and :runtime_id
-	*	Elements know about their :children and :descendants
-
-===	Version 0.0.4 / 2013-10-11
+*    Enhancements
+    * Have implemented the following patterns:
+        *    ExpandCollapse
+        *    Invoke
+        *    Selection
+        *    SelectionItem
+        *    Toggle
+        *    Value
+    *    Element can find their descendants by :id or :name
+    *    Can search for top-level elements with Regex
+    *    Elements can be refreshed
+    *    Moved Uia methods to be class-level (i.e. Uia.find_element rather than
+    including Uia)
+
+=== Version 0.0.5.1 / 2013-10-16
+*    Enhancements
+    *    reduced the size of the gem package by excluding gmock and gtest
+
+=== Version 0.0.5 / 2013-10-16
+
+*    Enhancements
+    *    Pushed #find_element into the Uia module
+    *    Can locate elements by :id, :handle, :runtime_pid and :pid
+    *    Element now knows about :id,:control_type, :patterns, :handle and :runtime_id
+    *    Elements know about their :children and :descendants
+
+=== Version 0.0.4 / 2013-10-11
 Initial release with very limited support for finding an element and
 displaying various properties.

data/Rakefile

@@ -2,18 +2,17 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-require 'albacore'
-require 'albacore/tasks/versionizer'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
 task :spec => :build_release
 task :build => :spec
 
 desc 'Build the release version of UiaDll'
-build :build_release do |b|
-  b.sln = 'ext/UiaDll/UiaDll.sln'
-  b.prop :Configuration, :Release
+task :build_release do
+  Dir.chdir('ext/UiaDll') do
+    if !system('msbuild UiaDll.sln -target:Rebuild -property:Configuration=Release')
+      fail "Failed to build UiaDll: #{$?.exitstatus}"
+    end
+  end
 end

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

@@ -179,6 +179,11 @@ namespace UIA.Helper
             return FindFirst(TreeScope.Subtree, new AndCondition(name.NameCondition(), ControlType.MenuItem.Condition()));
         }
 
+        public Element FirstMenuItem()
+        {
+            return FindFirst(TreeScope.Subtree, new AndCondition(Condition.TrueCondition, ControlType.MenuItem.Condition()));
+        }
+
         public static Element ByRuntimeId(int[] runtimeId)
         {
             var condition = new PropertyCondition(AutomationElement.RuntimeIdProperty, runtimeId);

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UIA.Helper</RootNamespace>
     <AssemblyName>UIA.Helper</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -60,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

data/ext/UiaDll/UiaDll/ComboBoxMethods.cpp

@@ -0,0 +1,89 @@
+#include "Stdafx.h"
+
+extern "C"
+{
+    __declspec(dllexport) int ComboBox_GetItems(ElementInformationPtr element, ElementInformation** items, char* errorInfo, const int errorInfoLength)
+    {
+        try {
+            int count = 0;
+
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Expand();
+
+            if ("ComboLBox" == Element::Windows[0]->ClassName)
+            {
+                auto childElements = Element::Windows[0]->Children;
+                *items = ElementInformation::From(childElements);
+                count = childElements->Length;
+            }
+            else
+            {
+                StringHelper::CopyToUnmanagedString("Unable to find list control associated with combo box", errorInfo, errorInfoLength);
+            }
+
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Collapse();
+
+            return count;
+        }
+        catch (Exception^ e) {
+            StringHelper::CopyToUnmanagedString(e, errorInfo, errorInfoLength);
+            return 0;
+        }
+    }
+
+    __declspec(dllexport) void ComboBox_SetItemByIndex(ElementInformationPtr element, const int itemIndex, char* errorInfo, const int errorInfoLength)
+    {
+        try {
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Expand();
+
+            if ("ComboLBox" == Element::Windows[0]->ClassName)
+            {
+                auto childElements = Element::Windows[0]->Children;
+                if (childElements->Length > itemIndex && itemIndex > -1)
+                {
+                    childElements[itemIndex]->As<SelectionItemPattern^>(SelectionItemPattern::Pattern)->Select();
+                }
+                else
+                {
+                    StringHelper::CopyToUnmanagedString("Specified index was not found in combo box list", errorInfo, errorInfoLength);
+                }
+            }
+            else
+            {
+                StringHelper::CopyToUnmanagedString("Unable to find list control associated with combo box", errorInfo, errorInfoLength);
+            }
+
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Collapse();
+        }
+        catch (Exception^ e) {
+            StringHelper::CopyToUnmanagedString(e, errorInfo, errorInfoLength);
+        }
+    }
+
+    __declspec(dllexport) void ComboBox_SetItemByValue(ElementInformationPtr element, const char* itemValue, char* errorInfo, const int errorInfoLength)
+    {
+        try {
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Expand();
+
+            if ("ComboLBox" == Element::Windows[0]->ClassName)
+            {
+                auto childElements = Element::Windows[0]->Children;
+                for each (auto item in childElements)
+                {
+                    if (strcmp(StringHelper::ToUnmanaged(item->Name), itemValue) == 0)
+                    {
+                        item->As<SelectionItemPattern^>(SelectionItemPattern::Pattern)->Select();
+                    }
+                }
+            }
+            else
+            {
+                StringHelper::CopyToUnmanagedString("Unable to find list control associated with combo box", errorInfo, errorInfoLength);
+            }
+
+            ElementFrom(element)->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern)->Collapse();
+        }
+        catch (Exception^ e) {
+            StringHelper::CopyToUnmanagedString(e, errorInfo, errorInfoLength);
+        }
+    }
+}

data/ext/UiaDll/UiaDll/MenuItemMethods.cpp

@@ -39,17 +39,47 @@ extern "C" {
     }
   }
 
+  void OpenMenuToCreateChildControls(ElementInformationPtr element)
+  {
+    auto firstItem = ElementFrom(element)->FirstMenuItem();
+    if (nullptr != firstItem)
+    {
+      try 
+      {
+        auto asExpand = firstItem->As<ExpandCollapsePattern^>(ExpandCollapsePattern::Pattern);
+        if (asExpand->Current.ExpandCollapseState == ExpandCollapseState::Collapsed)
+        {
+          asExpand->Expand();
+        }
+      }
+      catch (Exception^)
+      {}
+    }
+  }
+
   Element^ MenuItemPath(ElementInformationPtr element, list<const char*>& items) {
     auto current = ElementFrom(element);
+    bool foundAtleastOneItem = false;
 
     for(auto item = items.begin(); item != items.end(); ++item) {
       auto name = gcnew String(*item);
 
       current = current->MenuItem(name);
-      if( nullptr == current) {
+
+      if (nullptr == current && !foundAtleastOneItem)
+      {
+        OpenMenuToCreateChildControls(element);
+
+        current = ElementFrom(element)->MenuItem(name);
+      }
+
+      if (nullptr == current)
+      {
         throw gcnew MenuItemNotFound(String::Format("the menu item \"{0}\" was not found", name));
       }
 
+      foundAtleastOneItem = true;
+
       if( *item != items.back() ) {
         current->As<InvokePattern^>(InvokePattern::Pattern)->Invoke();
       }
@@ -57,4 +87,4 @@ extern "C" {
 
     return current;
   }
-}
+}

data/ext/UiaDll/UiaDll/SelectionMethods.cpp

@@ -16,12 +16,45 @@ extern "C" {
 
   __declspec(dllexport) int Selection_Selections(ElementInformationPtr element, ElementInformation** selections, char* errorInfo, const int errorInfoLength) {
     try {
-      auto selectedElements = Element::From(ElementFrom(element)->As<SelectionPattern^>(SelectionPattern::Pattern)->Current.GetSelection());
-      *selections = ElementInformation::From(selectedElements);
-      return selectedElements->Length;
+      int selectedItemCount = 0;
+
+      auto selectedElements = ElementFrom(element)->Find(TreeScope::Descendants, gcnew PropertyCondition(AutomationElement::ControlTypeProperty, ControlType::ListItem));
+      if (selectedElements->Length == 0)
+      {
+        selectedElements = ElementFrom(element)->Find(TreeScope::Descendants, gcnew PropertyCondition(AutomationElement::ControlTypeProperty, ControlType::TreeItem));
+      }
+
+      if (selectedElements->Length > 0)
+      {
+        for each (auto item in selectedElements)
+        {
+          if (item->As<SelectionItemPattern^>(SelectionItemPattern::Pattern)->Current.IsSelected)
+          {
+            selectedItemCount++;
+          }
+        }
+
+        auto selectedItems = new _ElementInformation[selectedItemCount];
+        int i = 0;
+        for each (auto item in selectedElements)
+        {
+          if (item->As<SelectionItemPattern^>(SelectionItemPattern::Pattern)->Current.IsSelected)
+          {
+            selectedItems[i].Refresh(item);
+            i++;
+          }
+        }
+        *selections = selectedItems;
+      }
+      else
+      {
+        *selections = nullptr;
+      }
+
+      return selectedItemCount;
     } catch(Exception^ e) {
       StringHelper::CopyToUnmanagedString(e, errorInfo, errorInfoLength);
       return 0;
     }
   }
-}
+}

data/ext/UiaDll/UiaDll/TableMethods.cpp

@@ -16,9 +16,15 @@ extern "C" {
 
   __declspec(dllexport) int Table_Headers(ElementInformationPtr element, ElementInformation** headers, char* errorInfo, const int errorInfoLength) {
     try {
-      auto headerElements = ElementFrom(element)->As<TablePattern^>(TablePattern::Pattern)->Current.GetColumnHeaders();
-      *headers = ElementInformation::From(Element::From(headerElements));
-      return headerElements->Length;
+      auto headerParent = ElementFrom(element)->Find(TreeScope::Children, gcnew PropertyCondition(AutomationElement::ControlTypeProperty, ControlType::Header));
+      if (headerParent->Length > 0)
+      {
+          auto headerElements = headerParent[0]->Children;
+          *headers = ElementInformation::From(headerElements);
+          return headerElements->Length;
+      }
+      *headers = nullptr;
+      return 0;
     } catch(Exception^ e) {
       StringHelper::CopyToUnmanagedString(e, errorInfo, errorInfoLength);
       return 0;
@@ -34,4 +40,4 @@ extern "C" {
       return NULL;
     }
   }
-}
+}

data/ext/UiaDll/UiaDll/UiaDll.vcxproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{16531A20-39FB-4BDB-8F1C-E2D619BBCF58}</ProjectGuid>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>UiaDll</RootNamespace>
   </PropertyGroup>
@@ -90,6 +90,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AssemblyInfo.cpp" />
+    <ClCompile Include="ComboBoxMethods.cpp" />
     <ClCompile Include="ConditionMethods.cpp" />
     <ClCompile Include="DynamicAssemblyResolver.cpp" />
     <ClCompile Include="ElementMethods.cpp" />

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

@@ -104,5 +104,8 @@
     <ClCompile Include="MenuItemMethods.cpp">
       <Filter>Source Files\ControlTypes</Filter>
     </ClCompile>
+    <ClCompile Include="ComboBoxMethods.cpp">
+      <Filter>Source Files\ControlTypes</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

data/ext/UiaDll/UiaDll.Test/UiaDll.Test.vcxproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E83CF3F7-74C6-4333-89E3-36C6297F0A06}</ProjectGuid>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>UiaDllTest</RootNamespace>
   </PropertyGroup>

data/lib/uia/control_types/combo_box.rb

@@ -0,0 +1,25 @@
+module Uia
+  module ControlTypes
+    module ComboBox
+
+      def items
+        Library.combo_box_items @element
+      end
+
+      def set(value)
+        case value
+        when String
+          Library.combo_box_set_item_by_value @element, value
+        when Regexp
+          found_item = items.find { |e| e.name =~ value }
+          if found_item
+            Library.combo_box_set_item_by_value @element, found_item.name
+          end
+        when Fixnum
+          Library.combo_box_set_item_by_index @element, value
+        end
+      end
+
+    end
+  end
+end

data/lib/uia/library.rb

@@ -144,6 +144,11 @@ module Uia
     # TextPattern methods
     attach_function :Text_GetText, [:pointer, :pointer, :int, :pointer, :int], :int
 
+    # ComboBox methods
+    elements_from :combo_box_items, :ComboBox_GetItems, [:pointer]
+    attach_throwable_function :combo_box_set_item_by_value, :ComboBox_SetItemByValue, [:pointer, :pointer], :void
+    attach_throwable_function :combo_box_set_item_by_index, :ComboBox_SetItemByIndex, [:pointer, :int], :void
+
     def self.get_text(element)
       length = can_throw(:Text_GetText, element, nil, 0) + 1
       p = FFI::MemoryPointer.new :pointer, length

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.7'
+  VERSION = '1.0'
 end

data/spec/app/WindowsForms.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+  </startup>
+</configuration>

data/spec/uia/control_types/combo_box_spec.rb

@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+
+describe Uia::ControlTypes::ComboBox do
+  let(:main) { Uia.find_element(id: 'MainFormWindow') }
+  Given(:combo_box) { main.find(id: 'FruitsComboBox').as(:value).with(:combo_box) }
+
+  context '#items' do
+    Then { combo_box.items.map(&:name) == ['Apple', 'Caimito', 'Coconut', 'Orange', 'Passion Fruit'] }
+  end
+
+  context '#set' do
+    context 'by index' do
+      When { combo_box.set 1 }
+      Then { combo_box.value == 'Caimito' }
+    end
+    context 'by value' do
+      When { combo_box.set 'Orange' }
+      Then { combo_box.value == 'Orange' }
+    end
+  end
+end

data/spec/uia/element_spec.rb

@@ -76,7 +76,7 @@ describe Uia::Element do
 
       context '#as' do
         When(:cast) { element.as :toggle }
-        Then { expect(cast).to have_failed UnsupportedPattern, "Pattern toggle not found in [:window, :transform]" }
+        Then { cast == Failure(UnsupportedPattern, "Pattern toggle not found in [:window, :transform]") }
       end
     end
 
@@ -133,7 +133,7 @@ describe Uia::Element do
 
     context 'combinations' do
       Then { element.find(control_type: :list, name: 'linkLabel1').id == 'FruitListBox' }
-      Then { element.find(control_type: :button, name: 'Forward', scope: :children) == nil }
+      Then { element.find(control_type: :button, name: 'Forward', scope: :element) == nil }
       Then { element.find(pattern: :invoke, name: 'About').id == 'aboutButton' }
       Then { element.find(control_type: :custom, id: 'automatableMonthCalendar1').name == 'linkLabel1' }
       Then { element.find(value: 'linkLabel1', id: 'automatableMonthCalendar1').control_type == :custom }
@@ -141,7 +141,7 @@ describe Uia::Element do
 
     context 'invalid' do
       When(:bad_locator) { element.find(bad_locator: 123) }
-      Then { expect(bad_locator).to have_failed BadLocator, "{:bad_locator=>123} is not a valid locator" }
+      Then { bad_locator == Failure(BadLocator, "{:bad_locator=>123} is not a valid locator") }
     end
 
     context 'limiting scope' do
@@ -164,7 +164,7 @@ describe Uia::Element do
     end
 
     context 'pattern' do
-      Then { element.filter(pattern: :value).count == 4 }
+      Then { element.filter(pattern: :value).count == 6 }
     end
 
     context 'combinations' do
@@ -172,11 +172,11 @@ describe Uia::Element do
     end
 
     context 'multiple' do
-      When(:radio_or_value) { element.filter(control_type: [:radio_button, :text]) }
-      Then { expect(radio_or_value.count).to eq(8) }
+      When(:radio_or_text) { element.filter(control_type: [:radio_button, :text]) }
+      Then { expect(radio_or_text.count).to eq(10) }
 
-      When(:value_or_invoke) { element.filter(pattern: [:value, :text]) }
-      Then { expect(value_or_invoke.count).to eq(5) }
+      When(:value_or_text) { element.filter(pattern: [:value, :text]) }
+      Then { expect(value_or_text.count).to eq(7) }
     end
   end
 
@@ -192,7 +192,7 @@ describe Uia::Element do
   end
 
   context '#children' do
-    Then { element.children.count == 27 }
+    Then { element.children.count == 30 }
     Then { element.children.all? { |c| c.instance_of? Uia::Element } }
   end
 

data/spec/uia/keys_spec.rb

@@ -25,6 +25,6 @@ describe Uia::Keys do
 
   context 'invalid' do
     When(:bad_keys) { encode('something', :bad_key) }
-    Then { expect(bad_keys).to have_failed InvalidKey, "#{:bad_key} is not a valid key" }
+    Then { bad_keys == Failure(InvalidKey, "#{:bad_key} is not a valid key") }
   end
 end

data/spec/uia/patterns/selection_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Uia::Patterns::Selection do
   let(:main) { Uia.find_element id: 'MainFormWindow' }
   Given(:select_list) { main.find(id: 'FruitListBox').as :selection }
-  Given(:combo_box) { main.find(id: 'FruitsComboBox').as :selection }
 
   context 'properties' do
     context '#multi_select?' do
@@ -17,7 +16,6 @@ describe Uia::Patterns::Selection do
     context '#selection_items' do
       let(:respond_to_selections) { lambda { |e| e.respond_to? :add_to_selection } }
 
-      Then { combo_box.selection_items.map(&:name) == ['Apple', 'Caimito', 'Coconut', 'Orange', 'Passion Fruit'] }
       Then { select_list.selection_items.all?(&respond_to_selections) == true }
 
       context 'multiple levels of #selection_items' do
@@ -26,6 +24,16 @@ describe Uia::Patterns::Selection do
         When { tree_view.selection_items.first.as(:expand_collapse).expand }
         Then { tree_view.selection_items.map(&:name) == ['Parent One', 'Child 1', 'Child 2', 'Parent Two'] }
       end
+
+      context 'can select tree view items' do
+        Given(:tree_view) { main.find(id: 'treeView').as :selection }
+        When do
+          tree_view.selection_items[0].as(:expand_collapse).expand
+          tree_view.selection_items[2].as(:expand_collapse).expand
+          tree_view.selection_items[3].select
+        end
+        Then { tree_view.selected_items.map(&:name) == ['Grandchild 1']}
+      end
     end
 
     context '#selected_items' do

data/spec/uia_spec.rb

@@ -30,8 +30,9 @@ describe Uia do
       Then { expect(Uia.find_element(runtime_id: main_window.runtime_id)).to be_instance_of(Element) }
 
       context 'can search descendants' do
-        Given(:element_with_no_handle) { Uia.find_element(id: 'MainFormWindow').find(name: 'Parent Two') }
-        Then { expect(element_with_no_handle.click).to be true }
+        Given(:element_with_no_handle) { Uia.find_element(id: 'MainFormWindow').find(name: 'Parent Two').as(:selection_item) }
+        When { element_with_no_handle.select }
+        Then { expect(element_with_no_handle.selected?).to be true }
       end
     end
 
@@ -48,7 +49,7 @@ describe Uia do
 
     context 'invalid locators' do
       When(:bad_input) { Uia.find_element(bad: 123) }
-      Then { expect(bad_input).to have_failed(Uia::BadLocator, '{:bad=>123} is not a valid locator') }
+      Then { bad_input == Failure(Uia::BadLocator, '{:bad=>123} is not a valid locator') }
     end
   end
-end
+end

data/uia.gemspec

@@ -25,13 +25,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'ffi', '~> 1.11.2'
+  spec.add_runtime_dependency 'ffi', '~> 1.14'
   spec.add_runtime_dependency 'require_all', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '>= 1.3'
-  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'rspec-given', '~> 3.8'
-  spec.add_development_dependency 'childprocess', '~> 3.0'
-  spec.add_development_dependency 'albacore', '~> 3.0.1'
+  spec.add_development_dependency 'childprocess', '~> 4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '1.0'
 platform: ruby
 authors:
 - Levi Wilson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: albacore
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '4.0'
 description: A low-level wrapper around Microsoft UI Automation for ruby
 email:
 - levi@leviwilson.com
@@ -166,6 +152,7 @@ files:
 - ext/UiaDll/UiaDll.sln
 - ext/UiaDll/UiaDll/ArrayHelper.h
 - ext/UiaDll/UiaDll/AssemblyInfo.cpp
+- ext/UiaDll/UiaDll/ComboBoxMethods.cpp
 - ext/UiaDll/UiaDll/ConditionHelper.h
 - ext/UiaDll/UiaDll/ConditionMethods.cpp
 - ext/UiaDll/UiaDll/DynamicAssemblyResolver.cpp
@@ -201,6 +188,7 @@ files:
 - lib/core_ext/string.rb
 - lib/core_ext/symbol.rb
 - lib/uia.rb
+- lib/uia/control_types/combo_box.rb
 - lib/uia/control_types/menu_item.rb
 - lib/uia/element.rb
 - lib/uia/finder.rb
@@ -228,8 +216,10 @@ files:
 - spec/app/FizzWare.NBuilder.dll
 - spec/app/UIA.Extensions.dll
 - spec/app/WindowsForms.exe
+- spec/app/WindowsForms.exe.config
 - spec/core_ext/symbol_spec.rb
 - spec/spec_helper.rb
+- spec/uia/control_types/combo_box_spec.rb
 - spec/uia/control_types/menu_item_spec.rb
 - spec/uia/element_spec.rb
 - spec/uia/keys_spec.rb
@@ -251,7 +241,7 @@ homepage: https://github.com/northwoodspd/uia
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,17 +256,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: A low-level wrapper around Microsoft UI Automation for ruby
 test_files:
 - spec/app/FizzWare.NBuilder.dll
 - spec/app/UIA.Extensions.dll
 - spec/app/WindowsForms.exe
+- spec/app/WindowsForms.exe.config
 - spec/core_ext/symbol_spec.rb
 - spec/spec_helper.rb
+- spec/uia/control_types/combo_box_spec.rb
 - spec/uia/control_types/menu_item_spec.rb
 - spec/uia/element_spec.rb
 - spec/uia/keys_spec.rb