Bug 1429338 - Refactor legacy mouse action tests. draft
authorHenrik Skupin <mail@hskupin.info>
Tue, 23 Jan 2018 17:30:18 +0100
changeset 752471 8173f815579402c386ad5d9121fc52c65d41749e
parent 751787 0790ec12200d5f663dd000a6ef3c72c795ca4ead
child 752472 6fc357d76546bc03b545fa9989d7dda34aef14f3
child 752473 e2da66a6f451981d672e91f1bfc9f9585c5d7d15
push id98282
push userbmo:hskupin@gmail.com
push dateThu, 08 Feb 2018 11:07:01 +0000
bugs1429338
milestone60.0a1
Bug 1429338 - Refactor legacy mouse action tests. MozReview-Commit-ID: Cmcl1OBBGRw
testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
rename from testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
rename to testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
@@ -12,25 +12,31 @@ from marionette_driver.marionette import
 
 from marionette_harness import MarionetteTestCase
 
 
 def inline(doc):
     return "data:text/html;charset=utf-8,{}".format(urllib.quote(doc))
 
 
-class TestMouseAction(MarionetteTestCase):
+class BaseLegacyMouseAction(MarionetteTestCase):
+
     def setUp(self):
-        MarionetteTestCase.setUp(self)
+        super(BaseLegacyMouseAction, self).setUp()
+
         if self.marionette.session_capabilities["platformName"] == "darwin":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
+
         self.action = Actions(self.marionette)
 
+
+class TestLegacyMouseAction(BaseLegacyMouseAction):
+
     def test_click_action(self):
         test_html = self.marionette.absolute_url("test.html")
         self.marionette.navigate(test_html)
         link = self.marionette.find_element(By.ID, "mozLink")
         self.action.click(link).perform()
         self.assertEqual("Clicked", self.marionette.execute_script(
             "return document.getElementById('mozLink').innerHTML"))
 
@@ -87,33 +93,41 @@ class TestMouseAction(MarionetteTestCase
         data_uri = "data:text/html,<html></html>"
         with self.marionette.using_context("chrome"):
             urlbar = self.marionette.find_element(By.ID, "urlbar")
             urlbar.send_keys(data_uri)
             go_button = self.marionette.execute_script("return gURLBar.goButton")
             self.action.click(go_button).perform()
         self.wait_for_condition(lambda mn: mn.get_url() == data_uri)
 
+
+class TestChromeLegacyMouseAction(BaseLegacyMouseAction):
+
+    def setUp(self):
+        super(TestChromeLegacyMouseAction, self).setUp()
+
+        self.marionette.set_context("chrome")
+
     def test_chrome_double_click(self):
-        self.marionette.navigate("about:blank")
         test_word = "quux"
 
-        with self.marionette.using_context("chrome"):
-            urlbar = self.marionette.find_element(By.ID, "urlbar")
-            self.assertEqual("", urlbar.get_property("value"))
+        with self.marionette.using_context("content"):
+            self.marionette.navigate("about:blank")
+
+        urlbar = self.marionette.find_element(By.ID, "urlbar")
+        self.assertEqual("", urlbar.get_property("value"))
 
-            urlbar.send_keys(test_word)
-            self.assertEqual(urlbar.get_property("value"), test_word)
-            (self.action.double_click(urlbar).perform()
-                        .key_down(self.mod_key)
-                        .key_down("x").perform())
-            self.assertEqual(urlbar.get_property("value"), "")
+        urlbar.send_keys(test_word)
+        self.assertEqual(urlbar.get_property("value"), test_word)
+        (self.action.double_click(urlbar).perform()
+                    .key_down(self.mod_key)
+                    .key_down("x").perform())
+        self.assertEqual(urlbar.get_property("value"), "")
 
     def test_chrome_context_click_action(self):
-        self.marionette.set_context("chrome")
         def context_menu_state():
             cm_el = self.marionette.find_element(By.ID, "tabContextMenu")
             return cm_el.get_property("state")
 
         currtab = self.marionette.execute_script("return gBrowser.selectedTab")
         self.assertEqual("closed", context_menu_state())
         self.action.context_click(currtab).perform()
         self.wait_for_condition(lambda _: context_menu_state() == "open")
--- a/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
+++ b/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
@@ -96,17 +96,17 @@ skip-if = true # Bug 925688
 skip-if = manage_instance == false || appname == 'fennec' # Bug 1298921
 [test_quit_restart.py]
 skip-if = manage_instance == false || appname == 'fennec' # Bug 1298921
 [test_with_using_context.py]
 
 [test_modal_dialogs.py]
 skip-if = appname == 'fennec' # Bug 1325738
 [test_key_actions.py]
-[test_mouse_action.py]
+[test_legacy_mouse_action.py]
 skip-if = appname == 'fennec'
 [test_teardown_context_preserved.py]
 [test_file_upload.py]
 skip-if = appname == 'fennec' || os == "win" # http://bugs.python.org/issue14574
 
 [test_execute_sandboxes.py]
 [test_prefs.py]
 [test_prefs_enforce.py]