From 69fdb44b1d06582ad2ddbe6275c2bb4d153f933f Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Thu, 16 Jul 2015 14:25:27 +0600
Subject: [PATCH 01/12] Introduce WiniumElement to wrap FrameworkElement

---
 Winium/TestApp.Test/py-functional/config.py   |   2 +-
 .../TestApp.WindowsPhone/MainPage.xaml        |   1 +
 .../TestApp.WindowsPhone/MainPage.xaml.cs     |  11 ++
 .../Winium.StoreApps.InnerServer/Automator.cs |   4 -
 .../Commands/ClickCommand.cs                  |  34 ----
 .../Commands/DisplayedCommand.cs              |   4 +-
 .../Commands/ElementCommand.cs                |  49 ++---
 .../Commands/ElementsCommand.cs               |  45 ++---
 .../Commands/ExecuteCommand.cs                |   3 +-
 .../Commands/GetElementAttributeCommand.cs    |   4 +-
 .../Helpers/FrameworkElementExtensions.cs     | 181 ------------------
 .../Commands/LocationCommand.cs               |   4 +-
 .../Commands/LocationInViewCommand.cs         |   3 +-
 .../Commands/PageSourceCommand.cs             |  41 ++--
 .../Commands/TextCommand.cs                   |   4 +-
 .../Element/ISearchable.cs                    |  27 +++
 .../Element/WiniumElement.Find.cs             |  59 ++++++
 .../Element/WiniumElement.GetSetAttribute.cs  |  86 +++++++++
 .../Element/WiniumElement.GetText.cs          |  37 ++++
 .../Element/WiniumElement.IsUserVisible.cs    |  87 +++++++++
 .../Element/WiniumElement.Location.cs         |  59 ++++++
 .../Element/WiniumElement.cs                  |  82 ++++++++
 .../Element/WiniumVirtualRoot.cs              | 118 ++++++++++++
 .../Winium.StoreApps.InnerServer.csproj       |   9 +-
 24 files changed, 635 insertions(+), 319 deletions(-)
 delete mode 100644 Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/ISearchable.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Find.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetSetAttribute.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetText.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
 create mode 100644 Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs

diff --git a/Winium/TestApp.Test/py-functional/config.py b/Winium/TestApp.Test/py-functional/config.py
index 981713f..aa40cff 100644
--- a/Winium/TestApp.Test/py-functional/config.py
+++ b/Winium/TestApp.Test/py-functional/config.py
@@ -7,6 +7,6 @@
             'TestApp.WindowsPhone_1.0.0.0_AnyCPU{0}.appx'.format(CONFIG_IDENTIFIER)
 
 DESIRED_CAPABILITIES = {
-    "app": os.path.abspath(os.path.join(BASE_DIR, APPX_PATH))
+    "app": os.path.abspath(os.path.join(BASE_DIR, APPX_PATH)),
     # "debugConnectToRunningApp": True
 }
diff --git a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
index 19023e9..e761f3a 100644
--- a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
+++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
@@ -42,6 +42,7 @@
                 TextChanged="SuggestionsTextChanged" 
                 SuggestionChosen="SuggestionsSuggestionChosen"></AutoSuggestBox>
                 <PasswordBox AutomationProperties.AutomationId="MyPasswordBox" PlaceholderText="Password"/>
+                <Button Content="Show Msg" Click="Button_Click"/>
             </StackPanel>
         </PivotItem>
     </Pivot>
diff --git a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
index 93625c6..d070fe6 100644
--- a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
+++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
@@ -128,5 +128,16 @@ private void SuggestionsTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextCha
                 sender.ItemsSource = suggestions;
             }
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            var noWifiDialog = new ContentDialog()
+            {
+                Title = "No wifi connection",
+                Content = "Check connection and try again",
+                PrimaryButtonText = "Ok"
+            };
+            noWifiDialog.ShowAsync();
+        }
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
index 5c396fc..ac6df20 100644
--- a/Winium/Winium.StoreApps.InnerServer/Automator.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -89,10 +89,6 @@ public string ProcessCommand(string content)
             {
                 commandToExecute = new ElementsCommand { ElementId = elementId };
             }
-            else if (command.Equals(DriverCommand.ClickElement))
-            {
-                commandToExecute = new ClickCommand { ElementId = elementId };
-            }
             else if (command.Equals(DriverCommand.SendKeysToElement))
             {
                 var values = ((JArray)parameters["value"]).ToObject<List<string>>();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs
deleted file mode 100644
index fe45777..0000000
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Winium.StoreApps.InnerServer.Commands
-{
-    #region
-
-    using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
-
-    #endregion
-
-    internal class ClickCommand : CommandBase
-    {
-        #region Public Properties
-
-        public string ElementId { get; set; }
-
-        #endregion
-
-        #region Public Methods and Operators
-
-        public override string DoImpl()
-        {
-            // Warning: this method does not actually click, it gets coordinates for use in outerdriver.
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-
-            // TODO: Replace with implementation using AutomationPeer
-            var coordinates = element.GetCoordinates(this.Automator.VisualRoot);
-            var strCoordinates = coordinates.X + ":" + coordinates.Y;
-
-            return this.JsonResponse(ResponseStatus.Success, strCoordinates);
-        }
-
-        #endregion
-    }
-}
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
index 3341af1..2c9d88b 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
@@ -3,7 +3,7 @@
     #region
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -20,7 +20,7 @@ internal class DisplayedCommand : CommandBase
         public override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var displayed = element.IsUserVisible(this.Automator.VisualRoot);
+            var displayed = new WiniumElement(element).IsUserVisible(this.Automator.VisualRoot);
 
             return this.JsonResponse(ResponseStatus.Success, displayed);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
index 5a46570..82d3c8a 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
@@ -4,12 +4,10 @@
 
     using System.Linq;
 
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Media;
-
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -28,52 +26,31 @@ public override string DoImpl()
             var searchValue = this.Parameters["value"].ToString();
             var searchPolicy = this.Parameters["using"].ToString();
 
-            DependencyObject relativeElement = this.ElementId == null
-                                                   ? this.Automator.VisualRoot
-                                                   : this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-
             var searchStrategy = new By(searchPolicy, searchValue);
-            var webObjectId = this.FindElementBy(relativeElement, searchStrategy);
 
-            if (webObjectId == null && this.ElementId == null)
+            WiniumElement winiumElement;
+
+            if (this.ElementId == null)
+            {
+                winiumElement  = WiniumVirtualRoot.Current.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
+            }
+            else
             {
-                var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-                foreach (var popupChild in popups.Select(popup => popup.Child))
-                {
-                    webObjectId = this.FindElementBy(popupChild, searchStrategy);
-                    if (webObjectId != null)
-                    {
-                        break;
-                    }
-                }
+                var parentElement = new WiniumElement(this.Automator.WebElements.GetRegisteredElement(this.ElementId));
+                winiumElement = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
             }
 
-            if (webObjectId == null)
+            if (winiumElement == null)
             {
                 throw new AutomationException("Element cannot be found", ResponseStatus.NoSuchElement);
             }
 
+            var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement.Element);
+
             var webElement = new JsonWebElementContent(webObjectId);
             return this.JsonResponse(ResponseStatus.Success, webElement);
         }
 
         #endregion
-
-        #region Methods
-
-        private string FindElementBy(DependencyObject relativeElement, By searchStrategy)
-        {
-            string foundId = null;
-
-            var element = (FrameworkElement)Finder.GetDescendantsBy(relativeElement, searchStrategy).FirstOrDefault();
-            if (element != null)
-            {
-                foundId = this.Automator.WebElements.RegisterElement(element);
-            }
-
-            return foundId;
-        }
-
-        #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
index dfbf144..61d23fe 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
@@ -5,11 +5,9 @@
     using System.Collections.Generic;
     using System.Linq;
 
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Media;
-
     using Winium.StoreApps.Common;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -28,41 +26,28 @@ public override string DoImpl()
             var searchValue = this.Parameters["value"].ToString();
             var searchPolicy = this.Parameters["using"].ToString();
 
-            DependencyObject relativeElement = this.ElementId == null
-                                                   ? this.Automator.VisualRoot
-                                                   : this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-
-            var result = new List<JsonWebElementContent>();
             var searchStrategy = new By(searchPolicy, searchValue);
-            var foundObjectsIdList = this.FindElementsBy(relativeElement, searchStrategy);
-            result.AddRange(foundObjectsIdList.Select(foundObjectId => new JsonWebElementContent(foundObjectId)));
+            List<WiniumElement> result;
 
             if (this.ElementId == null)
             {
-                var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-                foreach (var popupChild in popups.Select(popup => popup.Child))
-                {
-                    foundObjectsIdList = this.FindElementsBy(popupChild, searchStrategy);
-                    result.AddRange(
-                        foundObjectsIdList.Select(foundObjectId => new JsonWebElementContent(foundObjectId)));
-                }
+                result = WiniumVirtualRoot.Current.Find(TreeScope.Descendants, searchStrategy.Predicate).ToList();
+            }
+            else
+            {
+                var parentElement = new WiniumElement(this.Automator.WebElements.GetRegisteredElement(this.ElementId));
+                result = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).ToList();
             }
 
-            return this.JsonResponse(ResponseStatus.Success, result.ToArray());
-        }
-
-        #endregion
-
-        #region Methods
+            var registredObjects = new List<JsonWebElementContent>();
 
-        private IEnumerable<string> FindElementsBy(DependencyObject relativeElement, By searchStrategy)
-        {
-            var foundIds = new List<string>();
+            foreach (var winiumElement in result)
+            {
+                var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement.Element);
+                registredObjects.Add(new JsonWebElementContent(webObjectId));
+            }
 
-            foundIds.AddRange(
-                Finder.GetDescendantsBy(relativeElement, searchStrategy)
-                    .Select(element => this.Automator.WebElements.RegisterElement((FrameworkElement)element)));
-            return foundIds;
+            return this.JsonResponse(ResponseStatus.Success, registredObjects.ToArray());
         }
 
         #endregion
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
index d7817cf..6eb7dc7 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
@@ -16,6 +16,7 @@
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -180,7 +181,7 @@ private string ExecuteAttributeScript(string command)
             var attributeName = args[1].ToString();
             var value = args[2];
 
-            element.SetAttribute(attributeName, value);
+            new WiniumElement(element).SetAttribute(attributeName, value);
 
             return null;
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
index b9a57b1..20e3e11 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
@@ -10,7 +10,7 @@
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -46,7 +46,7 @@ public override string DoImpl()
              */
             try
             {
-                var propertyObject = element.GetAttribute(attributeName);
+                var propertyObject = new WiniumElement(element).GetAttribute(attributeName);
 
                 return this.JsonResponse(ResponseStatus.Success, SerializeObjectAsString(propertyObject));
             }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
index 7a10669..a360a87 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
@@ -13,7 +13,6 @@
     using Windows.UI.Xaml;
     using Windows.UI.Xaml.Automation;
     using Windows.UI.Xaml.Automation.Peers;
-    using Windows.UI.Xaml.Media;
 
     using Winium.StoreApps.Common.Exceptions;
 
@@ -39,57 +38,6 @@ internal static string AutomationName(this FrameworkElement element)
             return element == null ? null : element.GetValue(AutomationProperties.NameProperty) as string;
         }
 
-        internal static object GetAttribute(this FrameworkElement element, string attributeName)
-        {
-            object targetObject;
-            PropertyInfo targetPropertyInfo;
-
-            if (GetAttributeTarget(element, attributeName, out targetObject, out targetPropertyInfo))
-            {
-                return targetPropertyInfo.GetValue(targetObject, null);
-            }
-
-            throw new AutomationException("Could not access attribute {0}.", attributeName);
-        }
-
-        internal static bool GetAttributeTarget(
-            this object element, 
-            string attributeName, 
-            out object targetObject, 
-            out PropertyInfo targetPropertyInfo)
-        {
-            targetObject = null;
-            targetPropertyInfo = null;
-
-            object parent = null;
-            var curObject = element;
-            PropertyInfo propertyInfo = null;
-
-            var properties = attributeName.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (!properties.Any())
-            {
-                return false;
-            }
-
-            foreach (var property in properties)
-            {
-                parent = curObject;
-                propertyInfo = curObject.GetType().GetRuntimeProperty(property);
-                if (propertyInfo == null)
-                {
-                    return false;
-                }
-
-                curObject = propertyInfo.GetValue(curObject, null);
-            }
-
-            targetObject = parent;
-            targetPropertyInfo = propertyInfo;
-
-            return true;
-        }
-
         internal static AutomationPeer GetAutomationPeer(this FrameworkElement element)
         {
             var peer = FrameworkElementAutomationPeer.FromElement(element);
@@ -101,42 +49,6 @@ internal static AutomationPeer GetAutomationPeer(this FrameworkElement element)
             return peer;
         }
 
-        internal static Rect GetRect(this FrameworkElement element, UIElement visualRoot)
-        {
-            var point1 = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
-            var point2 = new Point(point1.X + element.ActualWidth, point1.Y + element.ActualHeight);
-
-            var scrPoint1 = ScreenCoordinatesHelper.LogicalPointToScreenPoint(point1);
-            var scrPoint2 = ScreenCoordinatesHelper.LogicalPointToScreenPoint(point2);
-
-            return new Rect(scrPoint1, scrPoint2);
-        }
-
-        internal static Point GetCoordinates(this FrameworkElement element, UIElement visualRoot)
-        {
-            var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
-            var center = new Point(point.X + (int)(element.ActualWidth / 2), point.Y + (int)(element.ActualHeight / 2));
-            return ScreenCoordinatesHelper.LogicalPointToScreenPoint(center);
-        }
-
-        internal static Point GetCoordinatesInView(this FrameworkElement element, UIElement visualRoot)
-        {
-            // TODO reasearch posibility to replace this code to GetClickablePoint()
-            // FIXME Location returns wrong coordinates when apps screen slides up due to some input element getting focus #34
-            var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
-            var center = new Point(point.X + (int)(element.ActualWidth / 2), point.Y + (int)(element.ActualHeight / 2));
-            var bounds = new Rect(point, new Size(element.ActualWidth, element.ActualHeight));
-            var boundsInView = new Rect(new Point(0, 0), visualRoot.RenderSize);
-            boundsInView.Intersect(bounds);
-
-            var result = boundsInView.IsEmpty
-                             ? center
-                             : new Point(
-                                   boundsInView.X + (int)(boundsInView.Width / 2), 
-                                   boundsInView.Y + (int)(boundsInView.Height / 2));
-            return ScreenCoordinatesHelper.LogicalPointToScreenPoint(result);
-        }
-
         internal static T GetProviderOrDefault<T>(this FrameworkElement element, PatternInterface patternInterface)
             where T : class
         {
@@ -157,99 +69,6 @@ internal static T GetProvider<T>(this FrameworkElement element, PatternInterface
             throw new AutomationException(string.Format(HelpNotSupportInterfaceMsg, typeof(T).Name));
         }
 
-        internal static string GetText(this FrameworkElement element)
-        {
-            var propertyNames = new List<string> { "Text", "Content" };
-
-            foreach (var textProperty in from propertyName in propertyNames
-                                         select element.GetType().GetRuntimeProperty(propertyName)
-                                         into textProperty
-                                         where textProperty != null
-                                         let value = textProperty.GetValue(element)
-                                         where value is string
-                                         select textProperty)
-            {
-                return textProperty.GetValue(element).ToString();
-            }
-
-            return string.Empty;
-        }
-
-        internal static bool IsUserVisible(this FrameworkElement element, UIElement visualRoot)
-        {
-            var zero = new Point(0, 0);
-            var elementSize = new Size(element.ActualWidth, element.ActualHeight);
-
-            // Check if element is of zero size
-            if (elementSize.Width <= 0 || elementSize.Height <= 0)
-            {
-                return false;
-            }
-
-            var rect = new Rect(zero, elementSize);
-            var bound = element.TransformToVisual(visualRoot).TransformBounds(rect);
-            var rootRect = new Rect(zero, visualRoot.RenderSize);
-            rootRect.Intersect(bound);
-
-            // Check if element is offscreen. Save time on traversing tree if element is not in root rect
-            if (rootRect.IsEmpty)
-            {
-                return false;
-            }
-
-            while (true)
-            {
-                if (element.Visibility != Visibility.Visible || !element.IsHitTestVisible || !(element.Opacity > 0))
-                {
-                    return false;
-                }
-
-                var container = VisualTreeHelper.GetParent(element) as FrameworkElement;
-                if (container == null)
-                {
-                    return true;
-                }
-
-                if (container.RenderSize.IsEmpty)
-                {
-                    // There are some elements in UI tree that always return zero size, e.g. ContentControl, etc.
-                    continue;
-                }
-
-                // FIXME we only check if element is visible in parent and parent visible in his parent and so on
-                // we do not actully check if any part of original element is visible in grandparents
-                elementSize = new Size(element.ActualWidth, element.ActualHeight);
-                rect = new Rect(zero, elementSize);
-                bound = element.TransformToVisual(container).TransformBounds(rect);
-                var containerRect = new Rect(zero, container.RenderSize);
-                
-                containerRect.Intersect(bound);
-
-                // Check if element is offscreen
-                if (containerRect.IsEmpty)
-                {
-                    return false;
-                }
-
-                element = container;
-            }
-        }
-
-        internal static void SetAttribute(this FrameworkElement element, string attributeName, JToken value)
-        {
-            object targetObject;
-            PropertyInfo targetPropertyInfo;
-
-            if (GetAttributeTarget(element, attributeName, out targetObject, out targetPropertyInfo))
-            {
-                targetPropertyInfo.SetValue(targetObject, value.ToObject(targetPropertyInfo.PropertyType));
-            }
-            else
-            {
-                throw new AutomationException("Could not access attribute {0}.", attributeName);
-            }
-        }
-
         #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
index ea8fec2..14aafd1 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
@@ -5,7 +5,7 @@
     using System.Collections.Generic;
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -22,7 +22,7 @@ internal class LocationCommand : CommandBase
         public override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = element.GetCoordinates(this.Automator.VisualRoot);
+            var coordinates = new WiniumElement(element).GetCoordinates(this.Automator.VisualRoot);
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
index 5017382..342d18f 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
@@ -6,6 +6,7 @@
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -22,7 +23,7 @@ internal class LocationInViewCommand : CommandBase
         public override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = element.GetCoordinatesInView(this.Automator.VisualRoot);
+            var coordinates = new WiniumElement(element).GetCoordinatesInView(this.Automator.VisualRoot);
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
index aa431bf..2bb3def 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
@@ -5,15 +5,11 @@
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using System.Linq;
     using System.Text;
     using System.Xml;
 
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Media;
-
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -49,27 +45,27 @@ public override string DoImpl()
 
         #region Methods
 
-        private void WriteElementToXml(XmlWriter writer, FrameworkElement item)
+        private void WriteElementToXml(XmlWriter writer, WiniumElement element)
         {
-            if (item == null)
+            if (element == null)
             {
                 return;
             }
 
-            writer.WriteStartElement(item.GetType().ToString());
-            var rect = item.GetRect(this.Automator.VisualRoot);
+            writer.WriteStartElement(element.ClassName);
+            var rect = element.GetRect(this.Automator.VisualRoot);
             var attributes = new Dictionary<string, string>
                                  {
-                                     { "name", item.AutomationName() }, 
-                                     { "id", item.AutomationId() }, 
-                                     { "xname", item.Name }, 
+                                     { "name", element.AutomationName }, 
+                                     { "id", element.AutomationId }, 
+                                     { "xname", element.XName }, 
                                      {
                                          "visible", 
-                                         item.IsUserVisible(this.Automator.VisualRoot)
+                                         element.IsUserVisible(this.Automator.VisualRoot)
                                          .ToString()
                                          .ToLowerInvariant()
                                      }, 
-                                     { "value", item.GetText() }, 
+                                     { "value", element.GetText() }, 
                                      { "x", rect.X.ToString(CultureInfo.InvariantCulture) }, 
                                      { "y", rect.Y.ToString(CultureInfo.InvariantCulture) }, 
                                      {
@@ -79,6 +75,10 @@ private void WriteElementToXml(XmlWriter writer, FrameworkElement item)
                                      {
                                          "height", 
                                          rect.Height.ToString(CultureInfo.InvariantCulture)
+                                     },
+                                     {
+                                         "clickable_point",
+                                         element.GetCoordinatesInView(this.Automator.VisualRoot).ToString(CultureInfo.InvariantCulture)
                                      }
                                  };
             foreach (var attribute in attributes)
@@ -86,11 +86,9 @@ private void WriteElementToXml(XmlWriter writer, FrameworkElement item)
                 writer.WriteAttributeString(attribute.Key, attribute.Value);
             }
 
-            var childrenCount = VisualTreeHelper.GetChildrenCount(item);
-            for (var i = 0; i < childrenCount; ++i)
+            foreach (var child in element.Find(TreeScope.Children, x => true))
             {
-                var child = VisualTreeHelper.GetChild(item, i);
-                this.WriteElementToXml(writer, child as FrameworkElement);
+                this.WriteElementToXml(writer, child);
             }
 
             writer.WriteEndElement();
@@ -99,11 +97,10 @@ private void WriteElementToXml(XmlWriter writer, FrameworkElement item)
         private void WriteElementsToXml(XmlWriter writer)
         {
             writer.WriteStartElement("root");
-            this.WriteElementToXml(writer, this.Automator.VisualRoot as FrameworkElement);
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-            foreach (var popupChild in popups.Select(popup => popup.Child))
+
+            foreach (var element in WiniumVirtualRoot.Current.Find(TreeScope.Children, x=> true))
             {
-                this.WriteElementToXml(writer, popupChild as FrameworkElement);
+                this.WriteElementToXml(writer, element);
             }
 
             writer.WriteEndElement();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
index 41aeb37..b6c3597 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
@@ -3,7 +3,7 @@
     #region
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -20,7 +20,7 @@ internal class TextCommand : CommandBase
         public override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var text = element.GetText();
+            var text = new WiniumElement(element).GetText();
 
             return this.JsonResponse(ResponseStatus.Success, text);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/ISearchable.cs b/Winium/Winium.StoreApps.InnerServer/Element/ISearchable.cs
new file mode 100644
index 0000000..97f45e1
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/ISearchable.cs
@@ -0,0 +1,27 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System;
+    using System.Collections.Generic;
+
+    using Windows.UI.Xaml;
+
+    #endregion
+
+    public enum TreeScope
+    {
+        Children = 2, 
+
+        Descendants = 4, 
+    }
+
+    internal interface ISearchable
+    {
+        #region Public Methods and Operators
+
+        IEnumerable<WiniumElement> Find(TreeScope scope, Predicate<FrameworkElement> predicate);
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Find.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Find.cs
new file mode 100644
index 0000000..4d7dbc7
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Find.cs
@@ -0,0 +1,59 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System;
+    using System.Collections.Generic;
+
+    using Windows.UI.Xaml;
+    using Windows.UI.Xaml.Media;
+
+    #endregion
+
+    internal partial class WiniumElement : ISearchable
+    {
+        #region Public Methods and Operators
+
+        public IEnumerable<WiniumElement> Find(TreeScope scope, Predicate<FrameworkElement> predicate)
+        {
+            if (!Enum.IsDefined(typeof(TreeScope), scope))
+            {
+                throw new ArgumentException("One of TreeScope.Children or TreeScope.Descendants should be set");
+            }
+
+            foreach (var descendant in IterDescendants(this.Element, !scope.HasFlag(TreeScope.Descendants)))
+            {
+                if (predicate(descendant))
+                {
+                    yield return new WiniumElement(descendant);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        private static IEnumerable<FrameworkElement> IterDescendants(FrameworkElement rootItem, bool childrenOnly)
+        {
+            var childrenCount = VisualTreeHelper.GetChildrenCount(rootItem);
+
+            for (var i = 0; i < childrenCount; ++i)
+            {
+                var child = VisualTreeHelper.GetChild(rootItem, i) as FrameworkElement;
+
+                yield return child;
+
+                if (!childrenOnly)
+                {
+                    foreach (var descendant in IterDescendants(child, false))
+                    {
+                        yield return descendant;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetSetAttribute.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetSetAttribute.cs
new file mode 100644
index 0000000..7eb232f
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetSetAttribute.cs
@@ -0,0 +1,86 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System;
+    using System.Linq;
+    using System.Reflection;
+
+    using Newtonsoft.Json.Linq;
+
+    using Winium.StoreApps.Common.Exceptions;
+
+    #endregion
+
+    internal partial class WiniumElement
+    {
+        #region Methods
+
+        internal object GetAttribute(string attributeName)
+        {
+            object targetObject;
+            PropertyInfo targetPropertyInfo;
+
+            if (this.GetAttributeTarget(attributeName, out targetObject, out targetPropertyInfo))
+            {
+                return targetPropertyInfo.GetValue(targetObject, null);
+            }
+
+            throw new AutomationException("Could not access attribute {0}.", attributeName);
+        }
+
+        internal void SetAttribute(string attributeName, JToken value)
+        {
+            object targetObject;
+            PropertyInfo targetPropertyInfo;
+
+            if (this.GetAttributeTarget(attributeName, out targetObject, out targetPropertyInfo))
+            {
+                targetPropertyInfo.SetValue(targetObject, value.ToObject(targetPropertyInfo.PropertyType));
+            }
+            else
+            {
+                throw new AutomationException("Could not access attribute {0}.", attributeName);
+            }
+        }
+
+        private bool GetAttributeTarget(
+            string attributeName, 
+            out object targetObject, 
+            out PropertyInfo targetPropertyInfo)
+        {
+            targetObject = null;
+            targetPropertyInfo = null;
+
+            object parent = null;
+            var curObject = (object)this.Element;
+            PropertyInfo propertyInfo = null;
+
+            var properties = attributeName.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (!properties.Any())
+            {
+                return false;
+            }
+
+            foreach (var property in properties)
+            {
+                parent = curObject;
+                propertyInfo = curObject.GetType().GetRuntimeProperty(property);
+                if (propertyInfo == null)
+                {
+                    return false;
+                }
+
+                curObject = propertyInfo.GetValue(curObject, null);
+            }
+
+            targetObject = parent;
+            targetPropertyInfo = propertyInfo;
+
+            return true;
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetText.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetText.cs
new file mode 100644
index 0000000..d595f1f
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.GetText.cs
@@ -0,0 +1,37 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reflection;
+
+    #endregion
+
+    internal partial class WiniumElement
+    {
+        #region Methods
+
+        internal string GetText()
+        {
+            var element = this.Element;
+
+            var propertyNames = new List<string> { "Text", "Content" };
+
+            foreach (var textProperty in from propertyName in propertyNames
+                                         select element.GetType().GetRuntimeProperty(propertyName)
+                                         into textProperty
+                                         where textProperty != null
+                                         let value = textProperty.GetValue(element)
+                                         where value is string
+                                         select textProperty)
+            {
+                return textProperty.GetValue(element).ToString();
+            }
+
+            return string.Empty;
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
new file mode 100644
index 0000000..0ab1ed6
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
@@ -0,0 +1,87 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using Windows.Foundation;
+    using Windows.UI.Xaml;
+    using Windows.UI.Xaml.Media;
+
+    #endregion
+
+    internal partial class WiniumElement
+    {
+        #region Methods
+
+        internal bool IsUserVisible(UIElement visualRoot)
+        {
+            /* TODO: There is IsOffscreen method on AutomationPeer that can be used.
+             * But it returns true even if currentElement is on another pivot (i.e. invisible)
+             * var peer = FrameworkElementAutomationPeer.FromElement(this.Element);
+             * return peer != null && peer.IsOffscreen();
+             * This might improve speed but will make all non user interactable elements, like border, scrollbiew "invisible"
+             */
+            var currentElement = this.Element;
+
+            var currentElementSize = new Size(currentElement.ActualWidth, currentElement.ActualHeight);
+
+            // Check if currentElement is of zero size
+            if (currentElementSize.Width <= 0 || currentElementSize.Height <= 0)
+            {
+                return false;
+            }
+
+            var zero = new Point(0, 0);
+
+            var rect = new Rect(zero, currentElementSize);
+            var bound = currentElement.TransformToVisual(visualRoot).TransformBounds(rect);
+            var rootRect = new Rect(zero, visualRoot.RenderSize);
+            rootRect.Intersect(bound);
+
+            // Check if currentElement is offscreen. Save time on traversing tree if currentElement is not in root rect
+            if (rootRect.IsEmpty)
+            {
+                return false;
+            }
+
+            while (true)
+            {
+                if (currentElement.Visibility != Visibility.Visible || !currentElement.IsHitTestVisible
+                    || !(currentElement.Opacity > 0))
+                {
+                    return false;
+                }
+
+                var container = VisualTreeHelper.GetParent(currentElement) as FrameworkElement;
+                if (container == null)
+                {
+                    return true;
+                }
+
+                if (container.RenderSize.IsEmpty)
+                {
+                    // There are some currentElements in UI tree that always return zero size, e.g. ContentControl, etc.
+                    continue;
+                }
+
+                // FIXME we only check if currentElement is visible in parent and parent visible in his parent and so on
+                // we do not actully check if any part of original currentElement is visible in grandparents
+                currentElementSize = new Size(currentElement.ActualWidth, currentElement.ActualHeight);
+                rect = new Rect(zero, currentElementSize);
+                bound = currentElement.TransformToVisual(container).TransformBounds(rect);
+                var containerRect = new Rect(zero, container.RenderSize);
+
+                containerRect.Intersect(bound);
+
+                // Check if currentElement is offscreen
+                if (containerRect.IsEmpty)
+                {
+                    return false;
+                }
+
+                currentElement = container;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
new file mode 100644
index 0000000..c44b567
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
@@ -0,0 +1,59 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using Windows.Foundation;
+    using Windows.UI.Xaml;
+
+    using Winium.StoreApps.InnerServer.Commands.Helpers;
+
+    #endregion
+
+    internal partial class WiniumElement
+    {
+        #region Methods
+
+        internal Point GetCoordinates(UIElement visualRoot)
+        {
+            var element = this.Element;
+
+            var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
+            var center = new Point(point.X + (int)(element.ActualWidth / 2), point.Y + (int)(element.ActualHeight / 2));
+            return ScreenCoordinatesHelper.LogicalPointToScreenPoint(center);
+        }
+
+        internal Point GetCoordinatesInView(UIElement visualRoot)
+        {
+            // TODO reasearch posibility to replace this code to GetClickablePoint()
+            var element = this.Element;
+
+            var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
+            var center = new Point(point.X + (int)(element.ActualWidth / 2), point.Y + (int)(element.ActualHeight / 2));
+            var bounds = new Rect(point, new Size(element.ActualWidth, element.ActualHeight));
+            var boundsInView = new Rect(new Point(0, 0), visualRoot.RenderSize);
+            boundsInView.Intersect(bounds);
+
+            var result = boundsInView.IsEmpty
+                             ? center
+                             : new Point(
+                                   boundsInView.X + (int)(boundsInView.Width / 2), 
+                                   boundsInView.Y + (int)(boundsInView.Height / 2));
+            return ScreenCoordinatesHelper.LogicalPointToScreenPoint(result);
+        }
+
+        internal Rect GetRect(UIElement visualRoot)
+        {
+            var element = this.Element;
+
+            var point1 = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
+            var point2 = new Point(point1.X + element.ActualWidth, point1.Y + element.ActualHeight);
+
+            var scrPoint1 = ScreenCoordinatesHelper.LogicalPointToScreenPoint(point1);
+            var scrPoint2 = ScreenCoordinatesHelper.LogicalPointToScreenPoint(point2);
+
+            return new Rect(scrPoint1, scrPoint2);
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
new file mode 100644
index 0000000..b10571b
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
@@ -0,0 +1,82 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System;
+
+    using Windows.UI.Xaml;
+    using Windows.UI.Xaml.Automation;
+
+    using Winium.StoreApps.Common;
+    using Winium.StoreApps.Common.Exceptions;
+
+    #endregion
+
+    internal partial class WiniumElement
+    {
+        #region Fields
+
+        private readonly WeakReference<FrameworkElement> weakElement;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        public WiniumElement(FrameworkElement element)
+        {
+            this.weakElement = new WeakReference<FrameworkElement>(element);
+        }
+
+        public FrameworkElement Element
+        {
+            get
+            {
+                FrameworkElement target;
+                if (this.weakElement.TryGetTarget(out target))
+                {
+                    return target;
+                }
+
+                throw new AutomationException("Stale element reference", ResponseStatus.StaleElementReference);
+            }
+        }
+        
+        #endregion
+
+        #region Public Properties
+
+        public string AutomationId
+        {
+            get
+            {
+                return this.Element.GetValue(AutomationProperties.AutomationIdProperty) as string;
+            }
+        }
+
+        public string AutomationName
+        {
+            get
+            {
+                return this.Element.GetValue(AutomationProperties.NameProperty) as string;
+            }
+        }
+
+        public string XName
+        {
+            get
+            {
+                return this.Element.Name;
+            }
+        }
+
+        public string ClassName
+        {
+            get
+            {
+                return this.Element.GetType().ToString();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs
new file mode 100644
index 0000000..11cf759
--- /dev/null
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs
@@ -0,0 +1,118 @@
+namespace Winium.StoreApps.InnerServer.Element
+{
+    #region
+
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using Windows.UI.Xaml;
+    using Windows.UI.Xaml.Media;
+
+    #endregion
+
+    internal class WiniumVirtualRoot : ISearchable
+    {
+        #region Static Fields
+
+        private static readonly Lazy<WiniumVirtualRoot> CurrentValue =
+            new Lazy<WiniumVirtualRoot>(() => new WiniumVirtualRoot());
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        private WiniumVirtualRoot()
+        {
+            this.VisulaRoot = new WiniumElement(GetTrueVisualRoot());
+        }
+
+        #endregion
+
+        #region Public Properties
+
+        public static WiniumVirtualRoot Current
+        {
+            get
+            {
+                return CurrentValue.Value;
+            }
+        }
+
+        public IEnumerable<WiniumElement> OpenPopups
+        {
+            get
+            {
+                var popups = VisualTreeHelper.GetOpenPopups(Window.Current).ToList();
+                return popups.Select(x => new WiniumElement(x.Child as FrameworkElement));
+            }
+        }
+
+        public WiniumElement VisulaRoot { get; private set; }
+
+        #endregion
+
+        #region Public Methods and Operators
+
+        public IEnumerable<WiniumElement> Find(TreeScope scope, Predicate<FrameworkElement> predicate)
+        {
+            if (!Enum.IsDefined(typeof(TreeScope), scope))
+            {
+                throw new ArgumentException("One of TreeScope.Children or TreeScope.Descendants should be set");
+            }
+
+            // yield main visual tree
+            if (predicate(this.VisulaRoot.Element))
+            {
+                yield return this.VisulaRoot;
+            }
+
+            if (scope.HasFlag(TreeScope.Descendants))
+            {
+                foreach (var element in this.VisulaRoot.Find(scope, predicate))
+                {
+                    yield return element;
+                }
+            }
+
+            // yield popups (AppBar, etc.)
+            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
+            foreach (var popupChild in popups.Select(popup => new WiniumElement(popup.Child as FrameworkElement)))
+            {
+                if (predicate(this.VisulaRoot.Element))
+                {
+                    yield return popupChild;
+                }
+
+                if (scope.HasFlag(TreeScope.Descendants))
+                {
+                    foreach (var popupElement in popupChild.Find(scope, predicate))
+                    {
+                        yield return popupElement;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        private static FrameworkElement GetTrueVisualRoot()
+        {
+            var root = Window.Current.Content;
+            while (true)
+            {
+                var parent = VisualTreeHelper.GetParent(root) as UIElement;
+                if (parent == null)
+                {
+                    return root as FrameworkElement;
+                }
+
+                root = parent;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
index 46c3f5b..3eff2fc 100644
--- a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
+++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -54,7 +54,6 @@
     <Compile Include="Commands\AlertCommand.cs" />
     <Compile Include="Commands\AlertTextCommand.cs" />
     <Compile Include="Commands\CloseAppCommand.cs" />
-    <Compile Include="Commands\ClickCommand.cs" />
     <Compile Include="Commands\CommandBase.cs" />
     <Compile Include="Commands\DisplayedCommand.cs" />
     <Compile Include="Commands\ExecuteCommand.cs" />
@@ -72,6 +71,14 @@
     <Compile Include="Commands\GetElementTagNameCommand.cs" />
     <Compile Include="Commands\TextCommand.cs" />
     <Compile Include="Commands\ValueCommand.cs" />
+    <Compile Include="Element\ISearchable.cs" />
+    <Compile Include="Element\WiniumElement.GetText.cs" />
+    <Compile Include="Element\WiniumElement.Find.cs" />
+    <Compile Include="Element\WiniumElement.Location.cs" />
+    <Compile Include="Element\WiniumElement.GetSetAttribute.cs" />
+    <Compile Include="Element\WiniumElement.cs" />
+    <Compile Include="Element\WiniumElement.IsUserVisible.cs" />
+    <Compile Include="Element\WiniumVirtualRoot.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

From ff63ba048e9401d0d01cde7eb817bb7042d39c75 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Tue, 21 Jul 2015 13:57:44 +0600
Subject: [PATCH 02/12] Add convenience methods to By helper

---
 .../Commands/Helpers/By.cs                    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
index 6942f60..821cd53 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
@@ -10,15 +10,25 @@
 
     internal class By
     {
+        private const string XNameStrategy = "xname";
+
+        private const string ClassNameStrategy = "class name";
+
+        private const string TagNameStrategy = "tag name";
+
+        private const string IdStrategy = "id";
+
+        private const string NameStrategy = "name";
+
         #region Constructors and Destructors
 
         public By(string strategy, string value)
         {
-            if (strategy.Equals("tag name") || strategy.Equals("class name"))
+            if (strategy.Equals(TagNameStrategy) || strategy.Equals(ClassNameStrategy))
             {
                 this.Predicate = x => x.GetType().ToString().Equals(value);
             }
-            else if (strategy.Equals("id"))
+            else if (strategy.Equals(IdStrategy))
             {
                 this.Predicate = x =>
                     {
@@ -26,7 +36,7 @@ public By(string strategy, string value)
                         return automationId != null && automationId.Equals(value);
                     };
             }
-            else if (strategy.Equals("name"))
+            else if (strategy.Equals(NameStrategy))
             {
                 this.Predicate = x =>
                     {
@@ -34,7 +44,7 @@ public By(string strategy, string value)
                         return automationName != null && automationName.Equals(value);
                     };
             }
-            else if (strategy.Equals("xname"))
+            else if (strategy.Equals(XNameStrategy))
             {
                 // TODO: transitional. to be depricated
                 this.Predicate = x =>
@@ -50,6 +60,16 @@ public By(string strategy, string value)
             }
         }
 
+        public static By ClassName(string value)
+        {
+            return new By(ClassNameStrategy, value);
+        }
+
+        public static By XName(string value)
+        {
+            return new By(XNameStrategy, value);
+        }
+
         #endregion
 
         #region Public Properties

From b2135932310bdefad6e04d1e82b0958af09d1d07 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Tue, 21 Jul 2015 13:58:47 +0600
Subject: [PATCH 03/12] Change targets for InnerServer (from portable to WP
 only)

---
 .../Winium.StoreApps.InnerServer.csproj          | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
index 3eff2fc..2903e0c 100644
--- a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
+++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -12,18 +12,18 @@
     <AssemblyName>Winium.StoreApps.InnerServer</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile32</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -42,10 +42,6 @@
       <Name>Winium.StoreApps.Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
-    <TargetPlatform Include="Windows, Version=8.1" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="AcceptedRequest.cs" />
     <Compile Include="AutomationServer.cs" />
@@ -89,7 +85,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

From 0f29c17b2e3650f4df3765e639bc7a45a5c06712 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Tue, 21 Jul 2015 14:00:40 +0600
Subject: [PATCH 04/12] Refactor element and commands to work with virtual root

---
 .../Winium.StoreApps.InnerServer/Automator.cs | 38 +++----------------
 .../Commands/CloseAppCommand.cs               |  2 +-
 .../Commands/CommandBase.cs                   | 14 +++----
 .../Commands/DisplayedCommand.cs              |  4 +-
 .../Commands/ElementCommand.cs                |  2 +-
 .../Commands/ElementsCommand.cs               |  2 +-
 .../Commands/ExecuteCommand.cs                |  2 +-
 .../Commands/GetElementAttributeCommand.cs    |  2 +-
 .../Commands/GetElementTagNameCommand.cs      |  2 +-
 .../Helpers/FrameworkElementExtensions.cs     | 10 +----
 .../Commands/LocationCommand.cs               |  4 +-
 .../Commands/LocationInViewCommand.cs         |  5 +--
 .../Commands/OrientationCommand.cs            |  4 +-
 .../Commands/PageSourceCommand.cs             | 17 ++++-----
 .../Commands/TextCommand.cs                   |  2 +-
 .../Commands/ValueCommand.cs                  |  2 +-
 .../Element/WiniumElement.IsUserVisible.cs    |  3 +-
 .../Element/WiniumElement.Location.cs         | 16 +++++---
 .../Element/WiniumVirtualRoot.cs              | 17 ++++-----
 19 files changed, 58 insertions(+), 90 deletions(-)

diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
index ac6df20..4e5ffde 100644
--- a/Winium/Winium.StoreApps.InnerServer/Automator.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -9,8 +9,8 @@
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
+    using Windows.UI.Core;
     using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Media;
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.InnerServer.Commands;
@@ -21,9 +21,9 @@ internal class Automator
     {
         #region Constructors and Destructors
 
-        public Automator(UIElement visualRoot)
+        public Automator(UIElement visualRoot = null)
         {
-            this.VisualRoot = GetTrueVisualRoot(visualRoot);
+            this.UiThreadDispatcher = Window.Current.Dispatcher;
             this.WebElements = new AutomatorElements();
             this.DoAfterResponseOnce = null;
         }
@@ -34,7 +34,7 @@ public Automator(UIElement visualRoot)
 
         public Action DoAfterResponseOnce { get; set; }
 
-        public UIElement VisualRoot { get; private set; }
+        public CoreDispatcher UiThreadDispatcher { get; private set; }
 
         public AutomatorElements WebElements { get; private set; }
 
@@ -91,7 +91,7 @@ public string ProcessCommand(string content)
             }
             else if (command.Equals(DriverCommand.SendKeysToElement))
             {
-                var values = ((JArray)parameters["value"]).ToObject<List<string>>();
+                var values = parameters["value"].ToObject<List<string>>();
                 var value = string.Empty;
                 if (values.Any())
                 {
@@ -155,33 +155,5 @@ public string ProcessCommand(string content)
         }
 
         #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Walk visual tree upwards til we find actual visual root. 
-        /// This fixes incorrect locations being returned for elements when app screen is scrolled up to make place for onscreen keyboards, etc (issue #34 ).
-        /// </summary>
-        /// <param name="visualRoot">
-        /// </param>
-        /// <returns>
-        /// The <see cref="UIElement"/>.
-        /// </returns>
-        private static UIElement GetTrueVisualRoot(UIElement visualRoot)
-        {
-            var root = visualRoot;
-            while (true)
-            {
-                var parent = VisualTreeHelper.GetParent(root) as UIElement;
-                if (parent == null)
-                {
-                    return root;
-                }
-
-                root = parent;
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/CloseAppCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CloseAppCommand.cs
index 5510253..7cd5273 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/CloseAppCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/CloseAppCommand.cs
@@ -10,7 +10,7 @@ internal class CloseAppCommand : CommandBase
     {
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             this.Automator.DoAfterResponseOnce = () => Application.Current.Exit();
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
index 3ab957d..87f42af 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
@@ -10,7 +10,6 @@
     using Newtonsoft.Json.Linq;
 
     using Windows.UI.Core;
-    using Windows.UI.Xaml;
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
@@ -31,12 +30,13 @@ internal class CommandBase
 
         #region Public Methods and Operators
 
-        public static void BeginInvokeSync(UIElement root, Action action)
+        private static void BeginInvokeSync(CoreDispatcher dispatcher, Action action)
         {
             Exception exception = null;
             var waitEvent = new AutoResetEvent(false);
 
-            root.Dispatcher.RunAsync(
+            // TODO Research dispatcher.RunIdleAsync
+            dispatcher.RunAsync(
                 CoreDispatcherPriority.Normal, 
                 () =>
                     {
@@ -69,7 +69,7 @@ public string Do()
             var response = string.Empty;
             try
             {
-                BeginInvokeSync(this.Automator.VisualRoot, () => { response = this.DoImpl(); });
+                BeginInvokeSync(this.Automator.UiThreadDispatcher, () => { response = this.DoImpl(); });
             }
             catch (AutomationException exception)
             {
@@ -83,7 +83,7 @@ public string Do()
             return response;
         }
 
-        public virtual string DoImpl()
+        protected virtual string DoImpl()
         {
             throw new NotImplementedException();
         }
@@ -94,12 +94,12 @@ public virtual string DoImpl()
         /// <returns>
         /// The <see cref="string"/>.
         /// </returns>
-        public string JsonResponse()
+        protected string JsonResponse()
         {
             return JsonConvert.SerializeObject(new JsonResponse(this.Session, ResponseStatus.Success, null));
         }
 
-        public string JsonResponse(ResponseStatus status, object value)
+        protected string JsonResponse(ResponseStatus status, object value)
         {
             if (status != ResponseStatus.Success && value == null)
             {
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
index 2c9d88b..feffcd4 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
@@ -17,10 +17,10 @@ internal class DisplayedCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var displayed = new WiniumElement(element).IsUserVisible(this.Automator.VisualRoot);
+            var displayed = new WiniumElement(element).IsUserVisible();
 
             return this.JsonResponse(ResponseStatus.Success, displayed);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
index 82d3c8a..fc03606 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
@@ -21,7 +21,7 @@ internal class ElementCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var searchValue = this.Parameters["value"].ToString();
             var searchPolicy = this.Parameters["using"].ToString();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
index 61d23fe..9065051 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
@@ -21,7 +21,7 @@ internal class ElementsCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var searchValue = this.Parameters["value"].ToString();
             var searchPolicy = this.Parameters["using"].ToString();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
index 6eb7dc7..4c7eac7 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
@@ -41,7 +41,7 @@ internal class ExecuteCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             string command;
             var prefix = string.Empty;
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
index 20e3e11..36377ca 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
@@ -24,7 +24,7 @@ internal class GetElementAttributeCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
index ad3e158..48da00e 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
@@ -16,7 +16,7 @@ internal class GetElementTagNameCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
             var tagName = element.GetType().ToString();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
index a360a87..383a0a4 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
@@ -2,14 +2,6 @@
 {
     #region
 
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-
-    using Newtonsoft.Json.Linq;
-
-    using Windows.Foundation;
     using Windows.UI.Xaml;
     using Windows.UI.Xaml.Automation;
     using Windows.UI.Xaml.Automation.Peers;
@@ -22,7 +14,7 @@ internal static class FrameworkElementExtensions
     {
         #region Constants
 
-        internal const string HelpNotSupportInterfaceMsg = "Element does not support {0} control pattern interface.";
+        private const string HelpNotSupportInterfaceMsg = "Element does not support {0} control pattern interface.";
 
         #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
index 14aafd1..3ddc70c 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
@@ -19,10 +19,10 @@ internal class LocationCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = new WiniumElement(element).GetCoordinates(this.Automator.VisualRoot);
+            var coordinates = new WiniumElement(element).GetCoordinates();
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
index 342d18f..945e9aa 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
@@ -5,7 +5,6 @@
     using System.Collections.Generic;
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Commands.Helpers;
     using Winium.StoreApps.InnerServer.Element;
 
     #endregion
@@ -20,10 +19,10 @@ internal class LocationInViewCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = new WiniumElement(element).GetCoordinatesInView(this.Automator.VisualRoot);
+            var coordinates = new WiniumElement(element).GetCoordinatesInView();
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs
index 5ace21e..0c1b5a6 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs
@@ -12,11 +12,11 @@ internal class OrientationCommand : CommandBase
     {
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var orientation = DisplayOrientations.Portrait;
 
-            /*var frame = this.Automator.VisualRoot as PhoneApplicationFrame;
+            /*var frame = WiniumVirtualRoot.Current.VisualRoot.Element as PhoneApplicationFrame;
             if (frame != null)
             {
                 orientation = frame.Orientation;
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
index 2bb3def..ce3336f 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs
@@ -23,7 +23,7 @@ internal class PageSourceCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             string source;
             var settings = new XmlWriterSettings { Indent = true, Encoding = new UTF8Encoding(false) };
@@ -53,7 +53,7 @@ private void WriteElementToXml(XmlWriter writer, WiniumElement element)
             }
 
             writer.WriteStartElement(element.ClassName);
-            var rect = element.GetRect(this.Automator.VisualRoot);
+            var rect = element.GetRect();
             var attributes = new Dictionary<string, string>
                                  {
                                      { "name", element.AutomationName }, 
@@ -61,9 +61,7 @@ private void WriteElementToXml(XmlWriter writer, WiniumElement element)
                                      { "xname", element.XName }, 
                                      {
                                          "visible", 
-                                         element.IsUserVisible(this.Automator.VisualRoot)
-                                         .ToString()
-                                         .ToLowerInvariant()
+                                         element.IsUserVisible().ToString().ToLowerInvariant()
                                      }, 
                                      { "value", element.GetText() }, 
                                      { "x", rect.X.ToString(CultureInfo.InvariantCulture) }, 
@@ -75,10 +73,11 @@ private void WriteElementToXml(XmlWriter writer, WiniumElement element)
                                      {
                                          "height", 
                                          rect.Height.ToString(CultureInfo.InvariantCulture)
-                                     },
+                                     }, 
                                      {
-                                         "clickable_point",
-                                         element.GetCoordinatesInView(this.Automator.VisualRoot).ToString(CultureInfo.InvariantCulture)
+                                         "clickable_point", 
+                                         element.GetCoordinatesInView()
+                                         .ToString(CultureInfo.InvariantCulture)
                                      }
                                  };
             foreach (var attribute in attributes)
@@ -98,7 +97,7 @@ private void WriteElementsToXml(XmlWriter writer)
         {
             writer.WriteStartElement("root");
 
-            foreach (var element in WiniumVirtualRoot.Current.Find(TreeScope.Children, x=> true))
+            foreach (var element in WiniumVirtualRoot.Current.Find(TreeScope.Children, x => true))
             {
                 this.WriteElementToXml(writer, element);
             }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
index b6c3597..7a9e378 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
@@ -17,7 +17,7 @@ internal class TextCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
             var text = new WiniumElement(element).GetText();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
index 1612b03..7883b2e 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
@@ -25,7 +25,7 @@ internal class ValueCommand : CommandBase
 
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
             var control = element as Control;
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
index 0ab1ed6..145e0e8 100644
--- a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.IsUserVisible.cs
@@ -12,7 +12,7 @@ internal partial class WiniumElement
     {
         #region Methods
 
-        internal bool IsUserVisible(UIElement visualRoot)
+        internal bool IsUserVisible()
         {
             /* TODO: There is IsOffscreen method on AutomationPeer that can be used.
              * But it returns true even if currentElement is on another pivot (i.e. invisible)
@@ -20,6 +20,7 @@ internal bool IsUserVisible(UIElement visualRoot)
              * return peer != null && peer.IsOffscreen();
              * This might improve speed but will make all non user interactable elements, like border, scrollbiew "invisible"
              */
+            var visualRoot = WiniumVirtualRoot.Current.VisualRoot.Element;
             var currentElement = this.Element;
 
             var currentElementSize = new Size(currentElement.ActualWidth, currentElement.ActualHeight);
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
index c44b567..c50d9db 100644
--- a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.Location.cs
@@ -3,7 +3,6 @@
     #region
 
     using Windows.Foundation;
-    using Windows.UI.Xaml;
 
     using Winium.StoreApps.InnerServer.Commands.Helpers;
 
@@ -11,10 +10,11 @@
 
     internal partial class WiniumElement
     {
-        #region Methods
+        #region Public Methods and Operators
 
-        internal Point GetCoordinates(UIElement visualRoot)
+        public Point GetCoordinates()
         {
+            var visualRoot = WiniumVirtualRoot.Current.VisualRoot.Element;
             var element = this.Element;
 
             var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
@@ -22,9 +22,10 @@ internal Point GetCoordinates(UIElement visualRoot)
             return ScreenCoordinatesHelper.LogicalPointToScreenPoint(center);
         }
 
-        internal Point GetCoordinatesInView(UIElement visualRoot)
+        public Point GetCoordinatesInView()
         {
             // TODO reasearch posibility to replace this code to GetClickablePoint()
+            var visualRoot = WiniumVirtualRoot.Current.VisualRoot.Element;
             var element = this.Element;
 
             var point = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
@@ -41,8 +42,13 @@ internal Point GetCoordinatesInView(UIElement visualRoot)
             return ScreenCoordinatesHelper.LogicalPointToScreenPoint(result);
         }
 
-        internal Rect GetRect(UIElement visualRoot)
+        #endregion
+
+        #region Methods
+
+        internal Rect GetRect()
         {
+            var visualRoot = WiniumVirtualRoot.Current.VisualRoot.Element;
             var element = this.Element;
 
             var point1 = element.TransformToVisual(visualRoot).TransformPoint(new Point(0, 0));
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs
index 11cf759..df8183a 100644
--- a/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumVirtualRoot.cs
@@ -24,7 +24,7 @@ internal class WiniumVirtualRoot : ISearchable
 
         private WiniumVirtualRoot()
         {
-            this.VisulaRoot = new WiniumElement(GetTrueVisualRoot());
+            this.VisualRoot = new WiniumElement(GetTrueVisualRoot());
         }
 
         #endregion
@@ -44,11 +44,11 @@ public IEnumerable<WiniumElement> OpenPopups
             get
             {
                 var popups = VisualTreeHelper.GetOpenPopups(Window.Current).ToList();
-                return popups.Select(x => new WiniumElement(x.Child as FrameworkElement));
+                return popups.Select(popup => new WiniumElement(popup.Child as FrameworkElement));
             }
         }
 
-        public WiniumElement VisulaRoot { get; private set; }
+        public WiniumElement VisualRoot { get; private set; }
 
         #endregion
 
@@ -62,24 +62,23 @@ public IEnumerable<WiniumElement> Find(TreeScope scope, Predicate<FrameworkEleme
             }
 
             // yield main visual tree
-            if (predicate(this.VisulaRoot.Element))
+            if (predicate(this.VisualRoot.Element))
             {
-                yield return this.VisulaRoot;
+                yield return this.VisualRoot;
             }
 
             if (scope.HasFlag(TreeScope.Descendants))
             {
-                foreach (var element in this.VisulaRoot.Find(scope, predicate))
+                foreach (var element in this.VisualRoot.Find(scope, predicate))
                 {
                     yield return element;
                 }
             }
 
             // yield popups (AppBar, etc.)
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-            foreach (var popupChild in popups.Select(popup => new WiniumElement(popup.Child as FrameworkElement)))
+            foreach (var popupChild in this.OpenPopups)
             {
-                if (predicate(this.VisulaRoot.Element))
+                if (predicate(popupChild.Element))
                 {
                     yield return popupChild;
                 }

From e0f9529d0dd7e04c4ff5be336acdbc752a01860b Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Tue, 21 Jul 2015 14:01:07 +0600
Subject: [PATCH 05/12] Fix Alert command to work with basic ContentDialog, add
 tests.

---
 .../py-functional/tests/__init__.py           | 10 +++-
 .../py-functional/tests/test_commands.py      | 36 +++++++++-----
 .../TestApp.WindowsPhone/MainPage.xaml        |  7 +--
 .../TestApp.WindowsPhone/MainPage.xaml.cs     | 11 +++--
 .../Commands/AlertCommand.cs                  | 47 +++++++++----------
 .../Commands/AlertTextCommand.cs              | 37 ++++-----------
 6 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/Winium/TestApp.Test/py-functional/tests/__init__.py b/Winium/TestApp.Test/py-functional/tests/__init__.py
index 0caf748..18cb420 100644
--- a/Winium/TestApp.Test/py-functional/tests/__init__.py
+++ b/Winium/TestApp.Test/py-functional/tests/__init__.py
@@ -1,9 +1,11 @@
 # coding: utf-8
+import pytest
 from selenium.webdriver import Remote
+from selenium.webdriver.support.wait import WebDriverWait
 import config
 
 
-class WuaTestCase:
+class WuaTestCase(object):
     """
     If True, then new session is created when test class is being setup,
     i.e. one session is used for all test methods in class.
@@ -38,4 +40,8 @@ def setup_class(cls):
     @classmethod
     def teardown_class(cls):
         if cls.__shared_session__:
-            WuaTestCase._destroy_session(cls)
\ No newline at end of file
+            WuaTestCase._destroy_session(cls)
+
+    @pytest.fixture
+    def waiter(self):
+        return WebDriverWait(self.driver, timeout=5)
\ No newline at end of file
diff --git a/Winium/TestApp.Test/py-functional/tests/test_commands.py b/Winium/TestApp.Test/py-functional/tests/test_commands.py
index 7d6156a..430fcc3 100644
--- a/Winium/TestApp.Test/py-functional/tests/test_commands.py
+++ b/Winium/TestApp.Test/py-functional/tests/test_commands.py
@@ -2,11 +2,10 @@
 import pytest
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver import ActionChains
-
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.wait import WebDriverWait
+
 from tests import WuaTestCase
 
 
@@ -164,17 +163,34 @@ def test_is_displayed(self):
 class TestAlert(WuaTestCase):
     # __shared_session__ = False
 
-    def test_get_alert_text(self):
+    @pytest.fixture
+    def second_tab(self, waiter):
+        pivots = self.driver.find_elements_by_class_name("Windows.UI.Xaml.Controls.Primitives.PivotHeaderItem")
+        pivots[1].click()
+        tab = self.driver.find_element_by_id('SecondTab')
+        waiter.until(EC.visibility_of(tab))
+        return tab
+
+    @pytest.fixture
+    def alert(self, second_tab, waiter):
+        second_tab.find_element_by_id('MsgBtn').click()
+        return waiter.until(EC.alert_is_present())
+
+    def test_get_alert_text(self, alert):
         """GET /session/:sessionId/alert_text Gets the text of the currently displayed alert"""
-        pytest.skip('TODO')
+        assert alert.text
 
-    def test_accept_alert(self):
+    def test_accept_alert(self, alert):
         """POST /session/:sessionId/accept_alert Accepts the currently displayed alert dialog."""
-        pytest.skip('TODO')
+        alert.accept()
+        textbox_value = self.driver.find_element_by_id('SecondTabTextBox').text
+        assert 'Accepted' == textbox_value
 
-    def test_dismiss_alert(self):
+    def test_dismiss_alert(self, alert):
         """POST /session/:sessionId/dismiss_alert Dismisses the currently displayed alert dialog."""
-        pytest.skip('TODO')
+        alert.dismiss()
+        textbox_value = self.driver.find_element_by_id('SecondTabTextBox').text
+        assert 'Dismissed' == textbox_value
 
 
 class TestExecuteScript(WuaTestCase):
@@ -265,14 +281,12 @@ def test_touch_actions(self):
 
 
 class TestAutoSuggestBox(WuaTestCase):
-    def test_select_suggest(self):
+    def test_select_suggest(self, waiter):
         self.driver.execute_script("mobile: OnScreenKeyboard.Disable")
 
         pivots = self.driver.find_elements_by_class_name("Windows.UI.Xaml.Controls.Primitives.PivotHeaderItem")
         pivots[1].click()
 
-        waiter = WebDriverWait(self.driver, timeout=5)
-
         autosuggestion_box = waiter.until(EC.presence_of_element_located((By.ID, 'MySuggestBox')))
         autosuggestion_input = autosuggestion_box.find_element_by_class_name('Windows.UI.Xaml.Controls.TextBox')
         autosuggestion_input.send_keys('A')
diff --git a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
index e761f3a..dcdae8b 100644
--- a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
+++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml
@@ -32,17 +32,18 @@
         <PivotItem Header="second" AutomationProperties.AutomationId="SecondTab">
             <StackPanel Orientation="Vertical">
             <TextBox
+                x:Name="SecondTabTextBox"
                 Text ="Nice swipe!"
                 AutomationProperties.AutomationId="SecondTabTextBox" />
-
-
             <AutoSuggestBox x:Name="Suggestions"
                 AutomationProperties.AutomationId ="MySuggestBox"
                 ItemsSource="{Binding }"
                 TextChanged="SuggestionsTextChanged" 
                 SuggestionChosen="SuggestionsSuggestionChosen"></AutoSuggestBox>
                 <PasswordBox AutomationProperties.AutomationId="MyPasswordBox" PlaceholderText="Password"/>
-                <Button Content="Show Msg" Click="Button_Click"/>
+                <Button Content="Show Msg" 
+                        Click="ButtonClick"
+                        AutomationProperties.AutomationId="MsgBtn" />
             </StackPanel>
         </PivotItem>
     </Pivot>
diff --git a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
index d070fe6..7b3ab82 100644
--- a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
+++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
@@ -129,15 +129,18 @@ private void SuggestionsTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextCha
             }
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private async void ButtonClick(object sender, RoutedEventArgs e)
         {
-            var noWifiDialog = new ContentDialog()
+            var noWifiDialog = new ContentDialog
             {
                 Title = "No wifi connection",
                 Content = "Check connection and try again",
-                PrimaryButtonText = "Ok"
+                PrimaryButtonText = "Ok",
+                SecondaryButtonText = "Cancel"
             };
-            noWifiDialog.ShowAsync();
+            var result = await noWifiDialog.ShowAsync();
+
+            this.SecondTabTextBox.Text = result == ContentDialogResult.Primary ? "Accepted" : "Dismissed";
         }
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs
index 8443192..d1e8cfb 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs
@@ -4,15 +4,14 @@
 
     using System.Linq;
 
-    using Windows.UI.Xaml;
     using Windows.UI.Xaml.Automation.Peers;
     using Windows.UI.Xaml.Automation.Provider;
     using Windows.UI.Xaml.Controls;
-    using Windows.UI.Xaml.Media;
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -31,41 +30,39 @@ public enum With
 
         #region Public Properties
 
-        public With Action { get; set; }
+        public With Action { private get; set; }
 
         #endregion
 
-        #region Public Methods and Operators
+        #region Methods
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
-            var buttonName = this.Action == With.Accept ? "LeftButton" : "RightButton";
+            var buttonName = this.Action == With.Accept ? "Button1Host" : "Button2Host";
 
-            // TODO: new parameter - Window
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-            foreach (var popup in popups)
+            var popup = WiniumVirtualRoot.Current.OpenPopups.FirstOrDefault();
+            if (popup == null || !(popup.Element is ContentDialog))
             {
-                var popupChild = popup.Child;
-                var element =
-                    (FrameworkElement)Finder.GetDescendantsBy(popupChild, new By("name", buttonName)).FirstOrDefault()
-                    as Button;
-                if (element == null)
-                {
-                    continue;
-                }
+                throw new AutomationException("No alert is displayed", ResponseStatus.NoAlertOpenError);
+            }
+
+            var hostStrategy = By.XName(buttonName);
+            var buttonHost = popup.Find(TreeScope.Descendants, hostStrategy.Predicate).FirstOrDefault();
 
-                var peer = new ButtonAutomationPeer(element);
-                var invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
-                if (invokeProv == null)
+            if (buttonHost != null)
+            {
+                var btnStrategy = By.ClassName(typeof(Button).FullName);
+                var button = buttonHost.Find(TreeScope.Children, btnStrategy.Predicate).FirstOrDefault();
+
+                if (button != null)
                 {
-                    continue;
-                }
+                    button.Element.GetProvider<IInvokeProvider>(PatternInterface.Invoke).Invoke();
 
-                invokeProv.Invoke();
-                return this.JsonResponse();
+                    return this.JsonResponse();
+                }
             }
 
-            throw new AutomationException("No alert is displayed", ResponseStatus.NoAlertOpenError);
+            throw new AutomationException("Could not find {0} in ContentDialog", buttonName);
         }
 
         #endregion
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs
index a2c595c..953c7d7 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs
@@ -4,13 +4,12 @@
 
     using System.Linq;
 
-    using Windows.UI.Xaml;
     using Windows.UI.Xaml.Controls;
-    using Windows.UI.Xaml.Media;
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -18,27 +17,18 @@ internal class AlertTextCommand : CommandBase
     {
         #region Public Methods and Operators
 
-        public override string DoImpl()
+        protected override string DoImpl()
         {
-            var message = string.Empty;
-
-            // TODO: new parameter - Window
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current).ToList();
-            var children = popups.Select(x => x.Child).ToList();
-            if (!children.Any())
+            var popup = WiniumVirtualRoot.Current.OpenPopups.FirstOrDefault();
+            if (popup == null || !(popup.Element is ContentDialog))
             {
                 throw new AutomationException("No alert is displayed", ResponseStatus.NoAlertOpenError);
             }
 
-            foreach (var popupChild in children)
-            {
-                message += FirstTextInChild(popupChild);
-                if (!string.IsNullOrEmpty(message))
-                {
-                    break;
-                }
-            }
-
+            var strategy = By.ClassName(typeof(TextBlock).FullName);
+            var textBoxes = popup.Find(TreeScope.Descendants, strategy.Predicate);
+            var message = string.Join("\n", textBoxes.Select(x => x.GetText()));
+            
             return this.JsonResponse(ResponseStatus.Success, message);
         }
 
@@ -46,17 +36,6 @@ public override string DoImpl()
 
         #region Methods
 
-        private static string FirstTextInChild(DependencyObject popupChild)
-        {
-            var elements = Finder.GetDescendantsBy(popupChild, new By("tag name", "System.Windows.Controls.TextBlock"));
-
-            return
-                elements.Select(o => o as TextBlock)
-                    .Where(textBlock => textBlock != null)
-                    .Select(textBlock => textBlock.Text)
-                    .FirstOrDefault(x => !string.IsNullOrEmpty(x));
-        }
-
         #endregion
     }
 }

From 952e5a83f11f258a36155aea9557921acb536314 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Wed, 22 Jul 2015 08:27:15 +0600
Subject: [PATCH 06/12] Transition element registry and commands to use
 WiniumElements instead of FrameworkElements

---
 .../TestApp.WindowsPhone/MainPage.xaml.cs     |  2 +-
 .../AutomationServer.cs                       | 20 ++---
 .../Winium.StoreApps.InnerServer/Automator.cs |  2 +-
 .../AutomatorElements.cs                      | 50 ++++++------
 .../Commands/CommandBase.cs                   | 62 +++++++-------
 .../Commands/DisplayedCommand.cs              |  2 +-
 .../Commands/ElementCommand.cs                |  4 +-
 .../Commands/ElementsCommand.cs               |  4 +-
 .../Commands/ExecuteCommand.cs                |  4 +-
 .../Commands/GetElementAttributeCommand.cs    |  2 +-
 .../Commands/GetElementTagNameCommand.cs      |  3 +-
 .../Commands/Helpers/By.cs                    | 32 +++++---
 .../Helpers/FrameworkElementExtensions.cs     |  5 ++
 .../Commands/LocationCommand.cs               |  2 +-
 .../Commands/LocationInViewCommand.cs         |  2 +-
 .../Commands/TextCommand.cs                   |  2 +-
 .../Commands/ValueCommand.cs                  |  2 +-
 .../Element/WiniumElement.cs                  | 80 +++++++++++++++----
 18 files changed, 168 insertions(+), 112 deletions(-)

diff --git a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
index 7b3ab82..0d93ca8 100644
--- a/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
+++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs
@@ -87,7 +87,7 @@ private void SetButtonOnClick(object sender, RoutedEventArgs e)
 
         private void MainPageOnLoaded(object sender, RoutedEventArgs e)
         {
-            AutomationServer.Instance.InitializeAndStart(Frame);
+            AutomationServer.Instance.InitializeAndStart();
         }
 
         private void GoAppBarButtonOnClick(object sender, RoutedEventArgs e)
diff --git a/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
index 21c771c..c5a3886 100644
--- a/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
+++ b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
@@ -9,7 +9,6 @@
 
     using Windows.Networking.Sockets;
     using Windows.Storage.Streams;
-    using Windows.UI.Xaml;
 
     using Winium.StoreApps.Common;
 
@@ -38,16 +37,14 @@ public class AutomationServer
         #region Public Methods and Operators
 
         /// <summary>
-        /// Initializes and starts <see cref="AutomationServer"/> on default port (9998) with specified parameters.
+        /// Initializes and starts <see cref="AutomationServer"/> on default port (9998).
         /// </summary>
         /// <remarks>
         /// Use it in conjuction with <see cref="Instance"/> to simplify inclusion of server in tested app.
         /// </remarks>
-        /// <param name="visualRoot">
-        /// </param>
-        public void InitializeAndStart(UIElement visualRoot)
+        public void InitializeAndStart()
         {
-            this.SetAutomator(visualRoot);
+            this.automator = new Automator();
             this.Start(9998);
         }
 
@@ -57,21 +54,14 @@ public void InitializeAndStart(UIElement visualRoot)
         /// <remarks>
         /// Use it in conjuction with <see cref="Instance"/> to simplify inclusion of server in tested app.
         /// </remarks>
-        /// <param name="visualRoot">
-        /// </param>
         /// <param name="port">
         /// </param>
-        public void InitializeAndStart(UIElement visualRoot, int port)
+        public void InitializeAndStart(int port)
         {
-            this.SetAutomator(visualRoot);
+            this.automator = new Automator();
             this.Start(port);
         }
 
-        public void SetAutomator(UIElement visualRoot)
-        {
-            this.automator = new Automator(visualRoot);
-        }
-
         public async void Start(int port)
         {
             if (this.isServerActive)
diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
index 4e5ffde..1e1faca 100644
--- a/Winium/Winium.StoreApps.InnerServer/Automator.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -21,7 +21,7 @@ internal class Automator
     {
         #region Constructors and Destructors
 
-        public Automator(UIElement visualRoot = null)
+        public Automator()
         {
             this.UiThreadDispatcher = Window.Current.Dispatcher;
             this.WebElements = new AutomatorElements();
diff --git a/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs b/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs
index 356dfc2..6f82971 100644
--- a/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs
+++ b/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs
@@ -8,10 +8,9 @@
     using System.Linq;
     using System.Threading;
 
-    using Windows.UI.Xaml;
-
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
+    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -25,7 +24,7 @@ internal class AutomatorElements
 
         #region Fields
 
-        private readonly Dictionary<string, WeakReference> registeredElements;
+        private readonly Dictionary<string, WiniumElement> registredElements;
 
         #endregion
 
@@ -33,55 +32,52 @@ internal class AutomatorElements
 
         public AutomatorElements()
         {
-            this.registeredElements = new Dictionary<string, WeakReference>();
+            this.registredElements = new Dictionary<string, WiniumElement>();
         }
 
         #endregion
 
         #region Public Methods and Operators
 
-        /// <summary>
-        /// Returns FrameworkElement registered with specified key if any exists. Throws if no element is found.
-        /// </summary>
-        /// <param name="registeredKey">
-        /// </param>
-        /// <exception cref="AutomationException">
-        /// Registered element is not found or element has been garbage collected.
-        /// </exception>
-        /// <returns>
-        /// The <see cref="FrameworkElement"/>.
-        /// </returns>
-        public FrameworkElement GetRegisteredElement(string registeredKey)
+        public WiniumElement GetRegisteredElement(string registredKey)
         {
-            WeakReference reference;
-            if (this.registeredElements.TryGetValue(registeredKey, out reference))
+            WiniumElement item;
+            if (this.registredElements.TryGetValue(registredKey, out item))
             {
-                var item = reference.Target as FrameworkElement;
-                if (item != null)
+                if (!item.IsStale)
                 {
                     return item;
                 }
+
+                this.registredElements.Remove(registredKey);
             }
 
             throw new AutomationException("Stale element reference", ResponseStatus.StaleElementReference);
         }
 
-        public string RegisterElement(FrameworkElement element)
+        public string RegisterElement(WiniumElement element)
         {
-            var registeredKey = this.registeredElements.FirstOrDefault(x => x.Value.Target == element).Key;
+            var registeredKey = this.registredElements.FirstOrDefault(x => x.Value.Equals(element)).Key;
 
             if (registeredKey == null)
             {
-                Interlocked.Increment(ref safeInstanceCount);
-
-                registeredKey = element.GetHashCode() + "-"
-                                + safeInstanceCount.ToString(string.Empty, CultureInfo.InvariantCulture);
-                this.registeredElements.Add(registeredKey, new WeakReference(element));
+                registeredKey = GenerateGuid(element);
+                this.registredElements.Add(registeredKey, element);
             }
 
             return registeredKey;
         }
 
         #endregion
+
+        #region Methods
+
+        private static string GenerateGuid(WiniumElement element)
+        {
+            Interlocked.Increment(ref safeInstanceCount);
+            return element.GetHashCode() + "-" + safeInstanceCount.ToString(string.Empty, CultureInfo.InvariantCulture);
+        }
+
+        #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
index 87f42af..e8bbbdb 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
@@ -30,35 +30,6 @@ internal class CommandBase
 
         #region Public Methods and Operators
 
-        private static void BeginInvokeSync(CoreDispatcher dispatcher, Action action)
-        {
-            Exception exception = null;
-            var waitEvent = new AutoResetEvent(false);
-
-            // TODO Research dispatcher.RunIdleAsync
-            dispatcher.RunAsync(
-                CoreDispatcherPriority.Normal, 
-                () =>
-                    {
-                        try
-                        {
-                            action();
-                        }
-                        catch (Exception ex)
-                        {
-                            exception = ex;
-                        }
-
-                        waitEvent.Set();
-                    });
-            waitEvent.WaitOne();
-
-            if (exception != null)
-            {
-                throw exception;
-            }
-        }
-
         public string Do()
         {
             if (this.Automator == null)
@@ -83,6 +54,10 @@ public string Do()
             return response;
         }
 
+        #endregion
+
+        #region Methods
+
         protected virtual string DoImpl()
         {
             throw new NotImplementedException();
@@ -109,6 +84,35 @@ protected string JsonResponse(ResponseStatus status, object value)
             return JsonConvert.SerializeObject(new JsonResponse(this.Session, status, value));
         }
 
+        private static void BeginInvokeSync(CoreDispatcher dispatcher, Action action)
+        {
+            Exception exception = null;
+            var waitEvent = new AutoResetEvent(false);
+
+            // TODO Research dispatcher.RunIdleAsync
+            dispatcher.RunAsync(
+                CoreDispatcherPriority.Normal, 
+                () =>
+                    {
+                        try
+                        {
+                            action();
+                        }
+                        catch (Exception ex)
+                        {
+                            exception = ex;
+                        }
+
+                        waitEvent.Set();
+                    });
+            waitEvent.WaitOne();
+
+            if (exception != null)
+            {
+                throw exception;
+            }
+        }
+
         #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
index feffcd4..f396f6e 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
@@ -20,7 +20,7 @@ internal class DisplayedCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var displayed = new WiniumElement(element).IsUserVisible();
+            var displayed = element.IsUserVisible();
 
             return this.JsonResponse(ResponseStatus.Success, displayed);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
index fc03606..4d2e428 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
@@ -36,7 +36,7 @@ protected override string DoImpl()
             }
             else
             {
-                var parentElement = new WiniumElement(this.Automator.WebElements.GetRegisteredElement(this.ElementId));
+                var parentElement = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
                 winiumElement = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
             }
 
@@ -45,7 +45,7 @@ protected override string DoImpl()
                 throw new AutomationException("Element cannot be found", ResponseStatus.NoSuchElement);
             }
 
-            var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement.Element);
+            var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement);
 
             var webElement = new JsonWebElementContent(webObjectId);
             return this.JsonResponse(ResponseStatus.Success, webElement);
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
index 9065051..86f0aff 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
@@ -35,7 +35,7 @@ protected override string DoImpl()
             }
             else
             {
-                var parentElement = new WiniumElement(this.Automator.WebElements.GetRegisteredElement(this.ElementId));
+                var parentElement = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
                 result = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).ToList();
             }
 
@@ -43,7 +43,7 @@ protected override string DoImpl()
 
             foreach (var winiumElement in result)
             {
-                var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement.Element);
+                var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement);
                 registredObjects.Add(new JsonWebElementContent(webObjectId));
             }
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
index 4c7eac7..b6b2f3a 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
@@ -181,7 +181,7 @@ private string ExecuteAttributeScript(string command)
             var attributeName = args[1].ToString();
             var value = args[2];
 
-            new WiniumElement(element).SetAttribute(attributeName, value);
+            element.SetAttribute(attributeName, value);
 
             return null;
         }
@@ -189,7 +189,7 @@ private string ExecuteAttributeScript(string command)
         private object ExecuteAutomationScript(string command)
         {
             var elementId = ((JArray)this.Parameters["args"])[0]["ELEMENT"].ToString();
-            var element = this.Automator.WebElements.GetRegisteredElement(elementId);
+            var element = this.Automator.WebElements.GetRegisteredElement(elementId).Element;
 
             switch (command)
             {
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
index 36377ca..e71ab37 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
@@ -46,7 +46,7 @@ protected override string DoImpl()
              */
             try
             {
-                var propertyObject = new WiniumElement(element).GetAttribute(attributeName);
+                var propertyObject = element.GetAttribute(attributeName);
 
                 return this.JsonResponse(ResponseStatus.Success, SerializeObjectAsString(propertyObject));
             }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
index 48da00e..e4799fe 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
@@ -19,9 +19,8 @@ internal class GetElementTagNameCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var tagName = element.GetType().ToString();
 
-            return this.JsonResponse(ResponseStatus.Success, tagName);
+            return this.JsonResponse(ResponseStatus.Success, element.ClassName);
         }
 
         #endregion
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
index 821cd53..0172213 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs
@@ -10,23 +10,31 @@
 
     internal class By
     {
-        private const string XNameStrategy = "xname";
+        #region Constants
 
         private const string ClassNameStrategy = "class name";
 
-        private const string TagNameStrategy = "tag name";
-
         private const string IdStrategy = "id";
 
         private const string NameStrategy = "name";
 
+        private const string TagNameStrategy = "tag name";
+
+        private const string XNameStrategy = "xname";
+
+        #endregion
+
         #region Constructors and Destructors
 
         public By(string strategy, string value)
         {
             if (strategy.Equals(TagNameStrategy) || strategy.Equals(ClassNameStrategy))
             {
-                this.Predicate = x => x.GetType().ToString().Equals(value);
+                this.Predicate = x =>
+                    {
+                        var className = (x as FrameworkElement).ClassName();
+                        return className.Equals(value);
+                    };
             }
             else if (strategy.Equals(IdStrategy))
             {
@@ -60,6 +68,16 @@ public By(string strategy, string value)
             }
         }
 
+        #endregion
+
+        #region Public Properties
+
+        public Predicate<DependencyObject> Predicate { get; private set; }
+
+        #endregion
+
+        #region Public Methods and Operators
+
         public static By ClassName(string value)
         {
             return new By(ClassNameStrategy, value);
@@ -71,11 +89,5 @@ public static By XName(string value)
         }
 
         #endregion
-
-        #region Public Properties
-
-        public Predicate<DependencyObject> Predicate { get; private set; }
-
-        #endregion
     }
 }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
index 383a0a4..9b68ff5 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs
@@ -30,6 +30,11 @@ internal static string AutomationName(this FrameworkElement element)
             return element == null ? null : element.GetValue(AutomationProperties.NameProperty) as string;
         }
 
+        internal static string ClassName(this FrameworkElement element)
+        {
+            return element == null ? null : element.GetType().ToString();
+        }
+
         internal static AutomationPeer GetAutomationPeer(this FrameworkElement element)
         {
             var peer = FrameworkElementAutomationPeer.FromElement(element);
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
index 3ddc70c..5f7257a 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
@@ -22,7 +22,7 @@ internal class LocationCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = new WiniumElement(element).GetCoordinates();
+            var coordinates = element.GetCoordinates();
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
index 945e9aa..5c8b93f 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
@@ -22,7 +22,7 @@ internal class LocationInViewCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var coordinates = new WiniumElement(element).GetCoordinatesInView();
+            var coordinates = element.GetCoordinatesInView();
             var coordinatesDict = new Dictionary<string, int>
                                       {
                                           { "x", (int)coordinates.X }, 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
index 7a9e378..283ae25 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
@@ -20,7 +20,7 @@ internal class TextCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var text = new WiniumElement(element).GetText();
+            var text = element.GetText();
 
             return this.JsonResponse(ResponseStatus.Success, text);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
index 7883b2e..8ea3135 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
@@ -28,7 +28,7 @@ internal class ValueCommand : CommandBase
         protected override string DoImpl()
         {
             var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
-            var control = element as Control;
+            var control = element.Element as Control;
             if (control == null)
             {
                 throw new AutomationException("Element referenced is not of control type.", ResponseStatus.UnknownError);
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
index b10571b..8ab7665 100644
--- a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
@@ -5,10 +5,10 @@
     using System;
 
     using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Automation;
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
+    using Winium.StoreApps.InnerServer.Commands.Helpers;
 
     #endregion
 
@@ -27,20 +27,15 @@ public WiniumElement(FrameworkElement element)
             this.weakElement = new WeakReference<FrameworkElement>(element);
         }
 
-        public FrameworkElement Element
+        public bool IsStale
         {
             get
             {
-                FrameworkElement target;
-                if (this.weakElement.TryGetTarget(out target))
-                {
-                    return target;
-                }
-
-                throw new AutomationException("Stale element reference", ResponseStatus.StaleElementReference);
+                FrameworkElement element;
+                return !this.weakElement.TryGetTarget(out element);
             }
         }
-        
+
         #endregion
 
         #region Public Properties
@@ -49,7 +44,7 @@ public string AutomationId
         {
             get
             {
-                return this.Element.GetValue(AutomationProperties.AutomationIdProperty) as string;
+                return this.Element.AutomationId();
             }
         }
 
@@ -57,7 +52,29 @@ public string AutomationName
         {
             get
             {
-                return this.Element.GetValue(AutomationProperties.NameProperty) as string;
+                return this.Element.AutomationName();
+            }
+        }
+
+        public string ClassName
+        {
+            get
+            {
+                return this.Element.ClassName();
+            }
+        }
+
+        public FrameworkElement Element
+        {
+            get
+            {
+                FrameworkElement target;
+                if (this.weakElement.TryGetTarget(out target))
+                {
+                    return target;
+                }
+
+                throw new AutomationException("Stale element reference", ResponseStatus.StaleElementReference);
             }
         }
 
@@ -69,12 +86,45 @@ public string XName
             }
         }
 
-        public string ClassName
+        #endregion
+
+        #region Public Methods and Operators
+
+        public override bool Equals(object obj)
         {
-            get
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, obj))
             {
-                return this.Element.GetType().ToString();
+                return true;
             }
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            return this.Equals((WiniumElement)obj);
+        }
+
+        public bool Equals(WiniumElement other)
+        {
+            FrameworkElement thisElement;
+            FrameworkElement otherElement;
+            if (this.weakElement.TryGetTarget(out thisElement) && other.weakElement.TryGetTarget(out otherElement))
+            {
+                return thisElement == otherElement;
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.weakElement != null ? this.weakElement.GetHashCode() : 0;
         }
 
         #endregion

From bcb0fc49d079a9114748ca58f08d5e2825b5a352 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Wed, 22 Jul 2015 09:38:21 +0600
Subject: [PATCH 07/12] Rename element registry

---
 Winium/Winium.StoreApps.InnerServer/Automator.cs              | 4 ++--
 .../Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs | 2 +-
 .../Winium.StoreApps.InnerServer/Commands/ElementCommand.cs   | 4 ++--
 .../Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs  | 4 ++--
 .../Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs   | 4 ++--
 .../Commands/GetElementAttributeCommand.cs                    | 2 +-
 .../Commands/GetElementTagNameCommand.cs                      | 2 +-
 .../Winium.StoreApps.InnerServer/Commands/LocationCommand.cs  | 2 +-
 .../Commands/LocationInViewCommand.cs                         | 2 +-
 Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs   | 2 +-
 Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs  | 2 +-
 .../{AutomatorElements.cs => ElementsRegistry.cs}             | 4 ++--
 .../Winium.StoreApps.InnerServer.csproj                       | 2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)
 rename Winium/Winium.StoreApps.InnerServer/{AutomatorElements.cs => ElementsRegistry.cs} (96%)

diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
index 1e1faca..d1559be 100644
--- a/Winium/Winium.StoreApps.InnerServer/Automator.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -24,7 +24,7 @@ internal class Automator
         public Automator()
         {
             this.UiThreadDispatcher = Window.Current.Dispatcher;
-            this.WebElements = new AutomatorElements();
+            this.ElementsRegistry = new ElementsRegistry();
             this.DoAfterResponseOnce = null;
         }
 
@@ -36,7 +36,7 @@ public Automator()
 
         public CoreDispatcher UiThreadDispatcher { get; private set; }
 
-        public AutomatorElements WebElements { get; private set; }
+        public ElementsRegistry ElementsRegistry { get; private set; }
 
         #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
index f396f6e..7f7abef 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
@@ -19,7 +19,7 @@ internal class DisplayedCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
             var displayed = element.IsUserVisible();
 
             return this.JsonResponse(ResponseStatus.Success, displayed);
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
index 4d2e428..bf17e86 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
@@ -36,7 +36,7 @@ protected override string DoImpl()
             }
             else
             {
-                var parentElement = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+                var parentElement = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
                 winiumElement = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
             }
 
@@ -45,7 +45,7 @@ protected override string DoImpl()
                 throw new AutomationException("Element cannot be found", ResponseStatus.NoSuchElement);
             }
 
-            var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement);
+            var webObjectId = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
 
             var webElement = new JsonWebElementContent(webObjectId);
             return this.JsonResponse(ResponseStatus.Success, webElement);
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
index 86f0aff..ce8a51c 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
@@ -35,7 +35,7 @@ protected override string DoImpl()
             }
             else
             {
-                var parentElement = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+                var parentElement = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
                 result = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).ToList();
             }
 
@@ -43,7 +43,7 @@ protected override string DoImpl()
 
             foreach (var winiumElement in result)
             {
-                var webObjectId = this.Automator.WebElements.RegisterElement(winiumElement);
+                var webObjectId = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
                 registredObjects.Add(new JsonWebElementContent(webObjectId));
             }
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
index b6b2f3a..a8fa9ad 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
@@ -176,7 +176,7 @@ private string ExecuteAttributeScript(string command)
             var args = (JArray)this.Parameters["args"];
 
             var elementId = args[0]["ELEMENT"].ToString();
-            var element = this.Automator.WebElements.GetRegisteredElement(elementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(elementId);
 
             var attributeName = args[1].ToString();
             var value = args[2];
@@ -189,7 +189,7 @@ private string ExecuteAttributeScript(string command)
         private object ExecuteAutomationScript(string command)
         {
             var elementId = ((JArray)this.Parameters["args"])[0]["ELEMENT"].ToString();
-            var element = this.Automator.WebElements.GetRegisteredElement(elementId).Element;
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(elementId).Element;
 
             switch (command)
             {
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
index e71ab37..7b2c55e 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
@@ -26,7 +26,7 @@ internal class GetElementAttributeCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
 
             JToken value;
             string attributeName = null;
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
index e4799fe..2744771 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs
@@ -18,7 +18,7 @@ internal class GetElementTagNameCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
 
             return this.JsonResponse(ResponseStatus.Success, element.ClassName);
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
index 5f7257a..99cac0b 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
@@ -21,7 +21,7 @@ internal class LocationCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
             var coordinates = element.GetCoordinates();
             var coordinatesDict = new Dictionary<string, int>
                                       {
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
index 5c8b93f..9b63f96 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
@@ -21,7 +21,7 @@ internal class LocationInViewCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
             var coordinates = element.GetCoordinatesInView();
             var coordinatesDict = new Dictionary<string, int>
                                       {
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
index 283ae25..b63327a 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
@@ -19,7 +19,7 @@ internal class TextCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
             var text = element.GetText();
 
             return this.JsonResponse(ResponseStatus.Success, text);
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
index 8ea3135..887236e 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs
@@ -27,7 +27,7 @@ internal class ValueCommand : CommandBase
 
         protected override string DoImpl()
         {
-            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
             var control = element.Element as Control;
             if (control == null)
             {
diff --git a/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs b/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
similarity index 96%
rename from Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs
rename to Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
index 6f82971..e0d59c0 100644
--- a/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs
+++ b/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
@@ -14,7 +14,7 @@
 
     #endregion
 
-    internal class AutomatorElements
+    internal class ElementsRegistry
     {
         #region Static Fields
 
@@ -30,7 +30,7 @@ internal class AutomatorElements
 
         #region Constructors and Destructors
 
-        public AutomatorElements()
+        public ElementsRegistry()
         {
             this.registredElements = new Dictionary<string, WiniumElement>();
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
index 2903e0c..1f85284 100644
--- a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
+++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -46,7 +46,7 @@
     <Compile Include="AcceptedRequest.cs" />
     <Compile Include="AutomationServer.cs" />
     <Compile Include="Automator.cs" />
-    <Compile Include="AutomatorElements.cs" />
+    <Compile Include="ElementsRegistry.cs" />
     <Compile Include="Commands\AlertCommand.cs" />
     <Compile Include="Commands\AlertTextCommand.cs" />
     <Compile Include="Commands\CloseAppCommand.cs" />

From cfb2d984acc59b1d9523d0c301325ffc5e7ba95a Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Wed, 22 Jul 2015 09:41:19 +0600
Subject: [PATCH 08/12] Fix warning in page source test

---
 Winium/TestApp.Test/py-functional/tests/test_commands.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Winium/TestApp.Test/py-functional/tests/test_commands.py b/Winium/TestApp.Test/py-functional/tests/test_commands.py
index 430fcc3..d378e35 100644
--- a/Winium/TestApp.Test/py-functional/tests/test_commands.py
+++ b/Winium/TestApp.Test/py-functional/tests/test_commands.py
@@ -47,7 +47,8 @@ def test_get_page_source(self):
         visual_root = next(root.iterfind('*'))
         assert 'Windows.UI.Xaml.Controls.ScrollViewer' == visual_root.tag
         assert sum(1 for _ in root.iterfind('*')) > 1, 'Page source should contain at both visual root and popups'
-        assert any(visual_root.iterfind('*')), 'Page source should contain at least one children of visual root'
+        first_child = next(visual_root.iterfind('*'), next)
+        assert first_child is not None, 'Page source should contain at least one children of visual root'
 
     @pytest.mark.parametrize(("by", "value"), [
         (By.ID, 'MyTextBox'),

From 310a6bf5804a88d4706738e4ffab472021d688ab Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Wed, 22 Jul 2015 09:41:01 +0600
Subject: [PATCH 09/12] Refactor InvokeSync in CommandBase

---
 .../Commands/CommandBase.cs                            | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
index e8bbbdb..a48d059 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
@@ -40,7 +40,7 @@ public string Do()
             var response = string.Empty;
             try
             {
-                BeginInvokeSync(this.Automator.UiThreadDispatcher, () => { response = this.DoImpl(); });
+                InvokeSync(this.Automator.UiThreadDispatcher, () => { response = this.DoImpl(); });
             }
             catch (AutomationException exception)
             {
@@ -84,10 +84,9 @@ protected string JsonResponse(ResponseStatus status, object value)
             return JsonConvert.SerializeObject(new JsonResponse(this.Session, status, value));
         }
 
-        private static void BeginInvokeSync(CoreDispatcher dispatcher, Action action)
+        private static void InvokeSync(CoreDispatcher dispatcher, Action action)
         {
             Exception exception = null;
-            var waitEvent = new AutoResetEvent(false);
 
             // TODO Research dispatcher.RunIdleAsync
             dispatcher.RunAsync(
@@ -102,10 +101,7 @@ private static void BeginInvokeSync(CoreDispatcher dispatcher, Action action)
                         {
                             exception = ex;
                         }
-
-                        waitEvent.Set();
-                    });
-            waitEvent.WaitOne();
+                    }).AsTask().Wait();
 
             if (exception != null)
             {

From 5f14e41a4750d509f971a5d976ca2ec49de0e042 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Mon, 27 Jul 2015 10:01:46 +0600
Subject: [PATCH 10/12] Fixes after code review

---
 Winium/Winium.StoreApps.Common/JsonWireClasses.cs     |  4 ++--
 .../Commands/ElementCommand.cs                        | 11 ++++++-----
 .../Commands/ElementsCommand.cs                       |  8 ++++----
 .../Element/WiniumElement.cs                          |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Winium/Winium.StoreApps.Common/JsonWireClasses.cs b/Winium/Winium.StoreApps.Common/JsonWireClasses.cs
index 49e3ab0..e68cfef 100644
--- a/Winium/Winium.StoreApps.Common/JsonWireClasses.cs
+++ b/Winium/Winium.StoreApps.Common/JsonWireClasses.cs
@@ -7,11 +7,11 @@ namespace Winium.StoreApps.Common
 
     #endregion
 
-    public class JsonWebElementContent
+    public class JsonElementContent
     {
         #region Constructors and Destructors
 
-        public JsonWebElementContent(string element)
+        public JsonElementContent(string element)
         {
             this.Element = element;
         }
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
index bf17e86..0d53063 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs
@@ -19,7 +19,7 @@ internal class ElementCommand : CommandBase
 
         #endregion
 
-        #region Public Methods and Operators
+        #region Methods
 
         protected override string DoImpl()
         {
@@ -32,7 +32,8 @@ protected override string DoImpl()
 
             if (this.ElementId == null)
             {
-                winiumElement  = WiniumVirtualRoot.Current.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
+                winiumElement =
+                    WiniumVirtualRoot.Current.Find(TreeScope.Descendants, searchStrategy.Predicate).FirstOrDefault();
             }
             else
             {
@@ -45,10 +46,10 @@ protected override string DoImpl()
                 throw new AutomationException("Element cannot be found", ResponseStatus.NoSuchElement);
             }
 
-            var webObjectId = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
+            var registeredKey = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
+            var registredObjects = new JsonElementContent(registeredKey);
 
-            var webElement = new JsonWebElementContent(webObjectId);
-            return this.JsonResponse(ResponseStatus.Success, webElement);
+            return this.JsonResponse(ResponseStatus.Success, registredObjects);
         }
 
         #endregion
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
index ce8a51c..c2d92a4 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs
@@ -19,7 +19,7 @@ internal class ElementsCommand : CommandBase
 
         #endregion
 
-        #region Public Methods and Operators
+        #region Methods
 
         protected override string DoImpl()
         {
@@ -39,12 +39,12 @@ protected override string DoImpl()
                 result = parentElement.Find(TreeScope.Descendants, searchStrategy.Predicate).ToList();
             }
 
-            var registredObjects = new List<JsonWebElementContent>();
+            var registredObjects = new List<JsonElementContent>();
 
             foreach (var winiumElement in result)
             {
-                var webObjectId = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
-                registredObjects.Add(new JsonWebElementContent(webObjectId));
+                var registeredKey = this.Automator.ElementsRegistry.RegisterElement(winiumElement);
+                registredObjects.Add(new JsonElementContent(registeredKey));
             }
 
             return this.JsonResponse(ResponseStatus.Success, registredObjects.ToArray());
diff --git a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
index 8ab7665..c4f8921 100644
--- a/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Element/WiniumElement.cs
@@ -12,7 +12,7 @@
 
     #endregion
 
-    internal partial class WiniumElement
+    internal partial class WiniumElement : IEquatable<WiniumElement>
     {
         #region Fields
 

From cbdcafd9ef477c87def98c09430a2d3e34d983e3 Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Mon, 27 Jul 2015 12:06:18 +0600
Subject: [PATCH 11/12] Fix documentation on how to embed InnerServer into app
 under test

---
 README.md                                     |  7 ++---
 README_RU.md                                  |  2 +-
 .../AutomationServer.cs                       | 29 ++++++++++++++++---
 .../Winium.StoreApps.InnerServer/Automator.cs |  5 ++++
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ee64890..97ff9d9 100644
--- a/README.md
+++ b/README.md
@@ -38,21 +38,20 @@ You can get Visual Studio and SDK from Microsoft [here](https://dev.windows.com/
 
 1. Add reference to `Winium.StoreApps.InnerServer` in AUT project ([install NuGet package](https://www.nuget.org/packages/Winium.StoreApps.InnerServer/) or build project yourself)
 
-2. In your AUT's source code find place where `Frame` is set (usually in `MainPageOnLoaded` for vanilla app or `PrepareApplication` if you use `Caliburn.Micro`)  add
+2. In your AUT's source code add following lines to be called on UI thread after visual root is initialized (usually in `MainPageOnLoaded` for vanilla app or `PrepareApplication` if you use `Caliburn.Micro`)
 
 	```cs
-	AutomationServer.Instance.InitializeAndStart(Frame);
+	AutomationServer.Instance.InitializeAndStart();
 	```
 
 	or (will include driver only for debug build)
 
 	```cs
 	#if DEBUG
-		AutomationServer.Instance.InitializeAndStart(Frame);
+		AutomationServer.Instance.InitializeAndStart();
 	#endif // DEBUG
 	```
 
-	where `Frame` is visual root of application.
 
 3. Write your tests using you favorite language. In your tests use `app` [desired capability](https://github.com/2gis/Winium.StoreApps/wiki/Capabilities) to set path to tested app's appx file. Here is python example:
 	```python
diff --git a/README_RU.md b/README_RU.md
index ac0dd7e..3fc8124 100644
--- a/README_RU.md
+++ b/README_RU.md
@@ -36,7 +36,7 @@ Winium.StoreApps это open-source инструмент для автомати
 ## Быстрый старт
 1. Добавить ссылку на `Winium.StoreApps.InnerServer` в проекте тестируемого приложения ([через NuGet пакет](https://www.nuget.org/packages/Winium.StoreApps.InnerServer/) или соберите проект у себя)
 
-2. В тестовом приложении найдите место в коде где корневой элемент визуального дерева приложения `Frame` проинициализирован (обычно в `MainPageOnLoaded` для чистых приложений или в `PrepareApplication`, если вы используете `Caliburn.Micro`)  и добавьте следующий код
+2. В тестовом приложении добавьте следующий код для исполнения на UI потоке после того, как был создан коде где корневой элемент визуального дерева (обычно в `MainPageOnLoaded` для чистых приложений или в `PrepareApplication`, если вы используете `Caliburn.Micro`)
 
 	```cs
 	AutomationServer.Instance.InitializeAndStart(Frame);
diff --git a/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
index c5a3886..d6d7def 100644
--- a/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
+++ b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs
@@ -37,19 +37,19 @@ public class AutomationServer
         #region Public Methods and Operators
 
         /// <summary>
-        /// Initializes and starts <see cref="AutomationServer"/> on default port (9998).
+        /// Initialize and starts <see cref="AutomationServer"/> with specified parameters.
         /// </summary>
         /// <remarks>
         /// Use it in conjuction with <see cref="Instance"/> to simplify inclusion of server in tested app.
         /// </remarks>
         public void InitializeAndStart()
         {
-            this.automator = new Automator();
+            this.Initialize();
             this.Start(9998);
         }
 
         /// <summary>
-        /// Initializes and starts <see cref="AutomationServer"/> with specified parameters.
+        /// Initialize and starts <see cref="AutomationServer"/> on default port.
         /// </summary>
         /// <remarks>
         /// Use it in conjuction with <see cref="Instance"/> to simplify inclusion of server in tested app.
@@ -58,12 +58,30 @@ public void InitializeAndStart()
         /// </param>
         public void InitializeAndStart(int port)
         {
-            this.automator = new Automator();
+            this.Initialize();
             this.Start(port);
         }
 
+        /// <summary>
+        /// Initialize <see cref="AutomationServer"/>.
+        /// This method must be called on UI thread.
+        /// </summary>
+        public void Initialize()
+        {
+            this.automator = new Automator();
+        }
+
+        /// <summary>
+        /// Start <see cref="AutomationServer"/> on specified port.
+        /// </summary>
+        /// <param name="port"></param>
         public async void Start(int port)
         {
+            if (this.automator == null)
+            {
+                throw new InvalidOperationException("Initialize must be called before starting the server.");
+            }
+
             if (this.isServerActive)
             {
                 return;
@@ -78,6 +96,9 @@ public async void Start(int port)
             await this.listener.BindServiceNameAsync(this.listeningPort.ToString(CultureInfo.InvariantCulture));
         }
 
+        /// <summary>
+        /// Stop <see cref="AutomationServer"/>.
+        /// </summary>
         public void Stop()
         {
             if (this.isServerActive)
diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
index d1559be..9adee33 100644
--- a/Winium/Winium.StoreApps.InnerServer/Automator.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -23,6 +23,11 @@ internal class Automator
 
         public Automator()
         {
+            if (Window.Current == null)
+            {
+                throw new InvalidOperationException("This method must be called from UI thread.");
+            }
+
             this.UiThreadDispatcher = Window.Current.Dispatcher;
             this.ElementsRegistry = new ElementsRegistry();
             this.DoAfterResponseOnce = null;

From dbf8c67bcea7a35ce677796dd517063987c7bd4e Mon Sep 17 00:00:00 2001
From: Nick Abalov <n.abalov@2Gis.ru>
Date: Mon, 27 Jul 2015 12:06:42 +0600
Subject: [PATCH 12/12] Minor clean up

---
 .../py-functional/tests/test_commands.py      |  4 +-
 .../Commands/CommandBase.cs                   |  1 -
 .../Commands/DisplayedCommand.cs              |  1 -
 .../Commands/ExecuteCommand.cs                |  1 -
 .../Commands/GetElementAttributeCommand.cs    |  3 +-
 .../Commands/Helpers/Finder.cs                | 46 -------------------
 .../Commands/LocationCommand.cs               |  1 -
 .../Commands/LocationInViewCommand.cs         |  1 -
 .../Commands/TextCommand.cs                   |  1 -
 .../ElementsRegistry.cs                       |  1 -
 .../Winium.StoreApps.InnerServer.csproj       |  1 -
 11 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs

diff --git a/Winium/TestApp.Test/py-functional/tests/test_commands.py b/Winium/TestApp.Test/py-functional/tests/test_commands.py
index d378e35..4e1dc44 100644
--- a/Winium/TestApp.Test/py-functional/tests/test_commands.py
+++ b/Winium/TestApp.Test/py-functional/tests/test_commands.py
@@ -174,7 +174,9 @@ def second_tab(self, waiter):
 
     @pytest.fixture
     def alert(self, second_tab, waiter):
-        second_tab.find_element_by_id('MsgBtn').click()
+        msg_btn = second_tab.find_element_by_id('MsgBtn')
+        waiter.until(EC.visibility_of(msg_btn))
+        msg_btn.click()
         return waiter.until(EC.alert_is_present())
 
     def test_get_alert_text(self, alert):
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
index a48d059..5218ae5 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs
@@ -4,7 +4,6 @@
 
     using System;
     using System.Collections.Generic;
-    using System.Threading;
 
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
index 7f7abef..0ec2d36 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs
@@ -3,7 +3,6 @@
     #region
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
index a8fa9ad..d227167 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs
@@ -16,7 +16,6 @@
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
     using Winium.StoreApps.InnerServer.Commands.Helpers;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
index 7b2c55e..237485f 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs
@@ -10,7 +10,6 @@
 
     using Winium.StoreApps.Common;
     using Winium.StoreApps.Common.Exceptions;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
@@ -73,7 +72,7 @@ private static string SerializeObjectAsString(object obj)
                 return null;
             }
 
-            // Serialize basic types as palin strings
+            // Serialize basic types as plain strings
             if (IsTypeSerializedUsingToString(obj.GetType()))
             {
                 return obj.ToString();
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs
deleted file mode 100644
index 7066da4..0000000
--- a/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace Winium.StoreApps.InnerServer.Commands.Helpers
-{
-    #region
-
-    using System;
-    using System.Collections.Generic;
-
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Media;
-
-    #endregion
-
-    internal class Finder
-    {
-        #region Methods
-
-        internal static IEnumerable<DependencyObject> GetDescendantsBy(DependencyObject rootItem, By searchStrategy)
-        {
-            var predicate = searchStrategy.Predicate;
-
-            return GetDescendantsByPredicate(rootItem, predicate);
-        }
-
-        private static IEnumerable<DependencyObject> GetDescendantsByPredicate(
-            DependencyObject rootItem, 
-            Predicate<DependencyObject> predicate)
-        {
-            var childrenCount = VisualTreeHelper.GetChildrenCount(rootItem);
-            for (var i = 0; i < childrenCount; ++i)
-            {
-                var child = VisualTreeHelper.GetChild(rootItem, i);
-                if (predicate(child))
-                {
-                    yield return child;
-                }
-
-                foreach (var grandChild in GetDescendantsByPredicate(child, predicate))
-                {
-                    yield return grandChild;
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
index 99cac0b..c4b7930 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs
@@ -5,7 +5,6 @@
     using System.Collections.Generic;
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
index 9b63f96..9ebbad9 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs
@@ -5,7 +5,6 @@
     using System.Collections.Generic;
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
index b63327a..d86cf81 100644
--- a/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
+++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs
@@ -3,7 +3,6 @@
     #region
 
     using Winium.StoreApps.Common;
-    using Winium.StoreApps.InnerServer.Element;
 
     #endregion
 
diff --git a/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs b/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
index e0d59c0..a2f8669 100644
--- a/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
+++ b/Winium/Winium.StoreApps.InnerServer/ElementsRegistry.cs
@@ -2,7 +2,6 @@
 {
     #region
 
-    using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.Linq;
diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
index 1f85284..6f5eaf3 100644
--- a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
+++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -56,7 +56,6 @@
     <Compile Include="Commands\ElementCommand.cs" />
     <Compile Include="Commands\ElementsCommand.cs" />
     <Compile Include="Commands\Helpers\By.cs" />
-    <Compile Include="Commands\Helpers\Finder.cs" />
     <Compile Include="Commands\GetElementAttributeCommand.cs" />
     <Compile Include="Commands\Helpers\FrameworkElementExtensions.cs" />
     <Compile Include="Commands\LocationCommand.cs" />