Refactor element model

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
 }

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)
+            WuaTestCase._destroy_session(cls)
+
+    @pytest.fixture
+    def waiter(self):
+        return WebDriverWait(self.driver, timeout=5)

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
 
 
@@ -48,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'),
@@ -164,17 +164,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 +282,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')

Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml

@@ -32,16 +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="ButtonClick"
+                        AutomationProperties.AutomationId="MsgBtn" />
             </StackPanel>
         </PivotItem>
     </Pivot>

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)
@@ -128,5 +128,19 @@ private void SuggestionsTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextCha
                 sender.ItemsSource = suggestions;
             }
         }
+
+        private async void ButtonClick(object sender, RoutedEventArgs e)
+        {
+            var noWifiDialog = new ContentDialog
+            {
+                Title = "No wifi connection",
+                Content = "Check connection and try again",
+                PrimaryButtonText = "Ok",
+                SecondaryButtonText = "Cancel"
+            };
+            var result = await noWifiDialog.ShowAsync();
+
+            this.SecondTabTextBox.Text = result == ContentDialogResult.Primary ? "Accepted" : "Dismissed";
+        }
     }
 }

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)

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,10 +21,10 @@ internal class Automator
     {
         #region Constructors and Destructors
 
-        public Automator(UIElement visualRoot)
+        public Automator()
         {
-            this.VisualRoot = GetTrueVisualRoot(visualRoot);
-            this.WebElements = new AutomatorElements();
+            this.UiThreadDispatcher = Window.Current.Dispatcher;
+            this.ElementsRegistry = new ElementsRegistry();
             this.DoAfterResponseOnce = null;
         }
 
@@ -34,9 +34,9 @@ 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; }
+        public ElementsRegistry ElementsRegistry { get; private set; }
 
         #endregion
 
@@ -89,13 +89,9 @@ 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>>();
+                var values = parameters["value"].ToObject<List<string>>();
                 var value = string.Empty;
                 if (values.Any())
                 {
@@ -159,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
     }
 }