Merge lp:~canonical-platform-qa/webbrowser-app/autopilot-address_bar-textfield into lp:webbrowser-app

[Leo Arias]

Refactor the address bar autopilot helpers so they can be used from external test cases.

This MP refactors the address bar autopilot helpers out of the test case class and into the custom proxy object.
This way, we can call the action helpers, like go_to_url, from tests that don't inherit from the web browser base test cases. In many cases we don't want to inherit from this class, so we can launch the browser from the dash, or test the integration of the browser with other apps.
Here we follow the page object pattern [1], so every component encapsulates the services it makes available to users.

[1] http://developer.ubuntu.com/apps/platform/guides/acceptance-testing-using-the-page-object-model/

[Leo Arias (elopio)]

@osomon, I removed the waits for osk. That's something that IMO shouldn't be implicitly tested when interacting with the address bar. In the ideal scenario, all the interaction between textfields and the osk would be tested by the toolkit. I think that part is ok. And when running the tests from the phone, they would use the OSK. That part is not ready yet, but on the last sprint we asked Michael Sheldon to update the osk-autopilot, so we should be closer by now.
Please let me know if you added those waits for a reason that I'm missing in this MP.

[Olivier Tilloy (osomon)]

Leo, the waits were initially added because the address bar used to be on the bottom edge, and focusing it would trigger the OSK to show, thus shifting the address bar upwards, and that would mess up the expected coordinates. For example, focusing the address bar then clicking the refresh button wouldn’t work if the test didn’t wait for the position of the address bar to settle.

The chrome is now on the top edge, so the waits are probably less useful, but it remains to be proven (by running all the tests on a device and verifying that they pass).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:847
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/559
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/310/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/95/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/95/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16565
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/316/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1337/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:847
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1355/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/613
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/346/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/113/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/611
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16661
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/284/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/352/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1355/rebuild

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

No objection to any of the POM style enhancements; I built and tested on local and found these tests working--agree with Olivier that we'll need to see a Jenkins approval before proceeding, though, if we want to land. Any other changes you're wishing to see Olivier?

review: Approve

[Leo Arias (elopio)]

> The chrome is now on the top edge, so the waits are probably less useful, but
> it remains to be proven (by running all the tests on a device and verifying
> that they pass).

FWIW, I ran the tests in the device and they all passed.

[Olivier Tilloy (osomon)]

516 + self.address_bar.clear()
517 + self.address_bar.write('xaMPL')

IIUC, self.address_bar.clear() is redundant, as self.address_bar.write(…) will first clear the contents of the field before typing the text.

[Olivier Tilloy (osomon)]

Same remark as above for the following snippets:

529 + self.address_bar.clear()
530 + self.address_bar.write('ubuntu')

577 + self.address_bar.clear()
578 + self.address_bar.write('(phil')

[Olivier Tilloy (osomon)]

The rest of the changes look good.

review: Approve

[Leo Arias (elopio)]

> Same remark as above for the following snippets:
>
> 529 + self.address_bar.clear()
> 530 + self.address_bar.write('ubuntu')
>
>
> 577 + self.address_bar.clear()
> 578 + self.address_bar.write('(phil')

As you were testing there the behaviour of the suggestions, I thought it would be better to make it explicit when we are clearing the address bar. When we call clear and there is nothing in the textfield, it does nothing; so we would be just duplicating one if, and no finger or mouse actions.

If you prefer, I can remove the calls to clear and use the keyword clear=True. Let me know if that seems better to you.

[Olivier Tilloy (osomon)]

Nah, that’s alright as it is. I was only pointing out that the code could have been made a tad more succinct, but I don’t have a strong opinion on it. Thanks!

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2014-11-11 15:28:50 +0000
+++ src/app/webbrowser/AddressBar.qml	2014-12-13 01:23:19 +0000
@@ -59,6 +59,7 @@
 
     TextField {
         id: textField
+        objectName: "addressBarTextField"
 
         anchors.fill: parent
 

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2014-11-06 15:42:56 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2014-12-13 01:23:19 +0000
@@ -14,24 +14,74 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+
+import autopilot.logging
 import ubuntuuitoolkit as uitk
 
-
-class AddressBar(uitk.UbuntuUIToolkitCustomProxyObjectBase):
-
-    def get_clear_button(self):
-        return self.select_single("AbstractButton")
-
-    def get_action_button(self):
-        return self.select_single("QQuickMouseArea", objectName="actionButton")
-
-    def get_bookmark_toggle(self):
-        return self.select_single("QQuickItem", objectName="bookmarkToggle")
+logger = logging.getLogger(__name__)
+
+
+class Browser(uitk.UbuntuUIToolkitCustomProxyObjectBase):
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.chrome = self._get_chrome()
+        self.address_bar = self.chrome.address_bar
+
+    def go_to_url(self, url):
+        self.address_bar.go_to_url(url)
+
+    def get_window(self):
+        return self.get_parent()
+
+    def _get_chrome(self):
+        return self.select_single(Chrome)
+
+    def get_current_webview(self):
+        return self.select_single("WebViewImpl", current=True)
+
+    def get_webviews(self):
+        return self.select_many("WebViewImpl")
+
+    def get_visible_webviews(self):
+        return self.select_many("WebViewImpl", visible=True)
+
+    def get_error_sheet(self):
+        return self.select_single("ErrorSheet")
+
+    def get_suggestions(self):
+        return self.select_single(Suggestions)
+
+    def get_geolocation_dialog(self):
+        return self.wait_select_single(GeolocationPermissionRequest)
+
+    def get_selection(self):
+        return self.wait_select_single(Selection)
+
+    def get_selection_actions(self):
+        return self.wait_select_single("ActionSelectionPopover",
+                                       objectName="selectionActions")
+
+    def get_tabs_view(self):
+        return self.wait_select_single(TabsView)
+
+    def get_new_tab_view(self):
+        return self.wait_select_single("NewTabView", visible=True)
+
+    def get_content_picker_dialog(self):
+        # only on devices
+        return self.wait_select_single("PopupBase",
+                                       objectName="contentPickerDialog")
 
 
 class Chrome(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
-    def get_address_bar(self):
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.address_bar = self._get_address_bar()
+
+    def _get_address_bar(self):
         return self.select_single(AddressBar)
 
     def get_back_button(self):
@@ -52,6 +102,37 @@
         return drawer.select_single("AbstractButton", objectName=actionName)
 
 
+class AddressBar(uitk.UbuntuUIToolkitCustomProxyObjectBase):
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.text_field = self.select_single(
+            uitk.TextField, objectName='addressBarTextField')
+
+    @autopilot.logging.log_action(logger.debug)
+    def focus(self):
+        self.pointing_device.click_object(self)
+        self.activeFocus.wait_for(True)
+
+    def clear(self):
+        self.text_field.clear()
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_url(self, url):
+        self.focus()
+        self.write(url)
+        self.text_field.keyboard.press_and_release('Enter')
+
+    def write(self, text, clear=True):
+        self.text_field.write(text, clear)
+
+    def get_action_button(self):
+        return self.select_single("QQuickMouseArea", objectName="actionButton")
+
+    def get_bookmark_toggle(self):
+        return self.select_single("QQuickItem", objectName="bookmarkToggle")
+
+
 class Suggestions(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
     def get_list(self):
@@ -100,51 +181,3 @@
 
     def get_add_button(self):
         return self.select_single("ToolbarAction", objectName="addTabButton")
-
-
-class Browser(uitk.UbuntuUIToolkitCustomProxyObjectBase):
-
-    def get_window(self):
-        return self.get_parent()
-
-    def get_keyboard_rectangle(self):
-        return self.select_single("KeyboardRectangle")
-
-    def get_chrome(self):
-        return self.select_single(Chrome)
-
-    def get_current_webview(self):
-        return self.select_single("WebViewImpl", current=True)
-
-    def get_webviews(self):
-        return self.select_many("WebViewImpl")
-
-    def get_visible_webviews(self):
-        return self.select_many("WebViewImpl", visible=True)
-
-    def get_error_sheet(self):
-        return self.select_single("ErrorSheet")
-
-    def get_suggestions(self):
-        return self.select_single(Suggestions)
-
-    def get_geolocation_dialog(self):
-        return self.wait_select_single(GeolocationPermissionRequest)
-
-    def get_selection(self):
-        return self.wait_select_single(Selection)
-
-    def get_selection_actions(self):
-        return self.wait_select_single("ActionSelectionPopover",
-                                       objectName="selectionActions")
-
-    def get_tabs_view(self):
-        return self.wait_select_single(TabsView)
-
-    def get_new_tab_view(self):
-        return self.wait_select_single("NewTabView", visible=True)
-
-    def get_content_picker_dialog(self):
-        # only on devices
-        return self.wait_select_single("PopupBase",
-                                       objectName="contentPickerDialog")

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2014-12-13 01:23:19 +0000
@@ -20,7 +20,7 @@
 import shutil
 import urllib.request
 
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Equals
 
 from autopilot.matchers import Eventually
 from autopilot.platform import model
@@ -87,44 +87,6 @@
     def main_window(self):
         return self.app.select_single(Browser)
 
-    def assert_osk_eventually_shown(self):
-        if model() != 'Desktop':
-            keyboardRectangle = self.main_window.get_keyboard_rectangle()
-            self.assertThat(keyboardRectangle.state,
-                            Eventually(Equals("shown")))
-
-    def assert_osk_eventually_hidden(self):
-        if model() != 'Desktop':
-            keyboardRectangle = self.main_window.get_keyboard_rectangle()
-            self.assertThat(keyboardRectangle.state,
-                            Eventually(Equals("hidden")))
-
-    def focus_address_bar(self):
-        address_bar = self.main_window.get_chrome().get_address_bar()
-        self.pointing_device.click_object(address_bar)
-        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
-        self.assert_osk_eventually_shown()
-
-    def clear_address_bar(self):
-        self.focus_address_bar()
-        self.assert_osk_eventually_shown()
-        address_bar = self.main_window.get_chrome().get_address_bar()
-        clear_button = address_bar.get_clear_button()
-        self.pointing_device.click_object(clear_button)
-        self.assertThat(address_bar.text, Eventually(Equals("")))
-
-    def type_in_address_bar(self, text):
-        address_bar = self.main_window.get_chrome().get_address_bar()
-        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
-        self.keyboard.type(text)
-        self.assertThat(address_bar.text, Eventually(Contains(text)))
-
-    def go_to_url(self, url):
-        self.clear_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
-        self.assert_osk_eventually_hidden()
-
     def assert_page_eventually_loading(self):
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.loading, Eventually(Equals(True)))
@@ -138,7 +100,7 @@
         self.assertThat(webview.loading, Eventually(Equals(False)))
 
     def open_tabs_view(self):
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         drawer_button = chrome.get_drawer_button()
         self.pointing_device.click_object(drawer_button)
         chrome.get_drawer()
@@ -158,8 +120,9 @@
         self.assert_number_webviews_eventually(new_count)
         self.main_window.get_new_tab_view()
         if model() == 'Desktop':
-            address_bar = self.main_window.get_chrome().get_address_bar()
-            self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+            self.assertThat(
+                self.main_window.address_bar.activeFocus,
+                Eventually(Equals(True)))
 
     def assert_number_webviews_eventually(self, count):
         self.assertThat(lambda: len(self.main_window.get_webviews()),

=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py'
--- tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2014-12-13 01:23:19 +0000
@@ -16,7 +16,6 @@
 
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
-from autopilot.platform import model
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
 
@@ -28,8 +27,8 @@
         super(TestAddressBarBookmark, self).setUp()
 
     def test_switching_tabs_updates_bookmark_toggle(self):
-        chrome = self.main_window.get_chrome()
-        address_bar = chrome.get_address_bar()
+        chrome = self.main_window.chrome
+        address_bar = self.main_window.address_bar
         bookmark_toggle = address_bar.get_bookmark_toggle()
         self.pointing_device.click_object(bookmark_toggle)
         self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
@@ -37,10 +36,7 @@
         self.open_tabs_view()
         self.open_new_tab()
         url = self.base_url + "/test2"
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
 
@@ -69,8 +65,7 @@
         tabs_view.wait_until_destroyed()
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
-        chrome = self.main_window.get_chrome()
-        address_bar = chrome.get_address_bar()
+        address_bar = self.main_window.address_bar
         bookmark_toggle = address_bar.get_bookmark_toggle()
         self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
         self.assertThat(bookmark_toggle.visible, Eventually(Equals(True)))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_states.py'
--- tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2014-12-13 01:23:19 +0000
@@ -23,33 +23,33 @@
 class TestAddressBarStates(StartOpenRemotePageTestCaseBase):
 
     def test_cancel_state_loading(self):
-        address_bar = self.main_window.get_chrome().get_address_bar()
+        address_bar = self.main_window.address_bar
         action_button = address_bar.get_action_button()
         url = self.base_url + "/wait/5"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assertThat(address_bar.state, Eventually(Equals("loading")))
         self.pointing_device.click_object(action_button)
         self.assertThat(address_bar.state, Eventually(Equals("")))
 
     def test_state_editing(self):
-        address_bar = self.main_window.get_chrome().get_address_bar()
+        address_bar = self.main_window.address_bar
         self.pointing_device.click_object(address_bar)
         self.assertThat(address_bar.state, Eventually(Equals("editing")))
         self.keyboard.press_and_release("Enter")
         self.assertThat(address_bar.state, Eventually(Equals("")))
 
     def test_looses_focus_when_loading_starts(self):
-        address_bar = self.main_window.get_chrome().get_address_bar()
+        address_bar = self.main_window.address_bar
         self.pointing_device.click_object(address_bar)
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
         self.assertThat(address_bar.state, Eventually(Equals("editing")))
         url = self.base_url + "/test2"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assertThat(address_bar.state, Eventually(Equals("")))
         self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
 
     def test_looses_focus_when_reloading(self):
-        address_bar = self.main_window.get_chrome().get_address_bar()
+        address_bar = self.main_window.address_bar
         self.pointing_device.click_object(address_bar)
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
         self.assertThat(address_bar.state, Eventually(Equals("editing")))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_backforward.py'
--- tests/autopilot/webbrowser_app/tests/test_backforward.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_backforward.py	2014-12-13 01:23:19 +0000
@@ -25,23 +25,23 @@
     """Tests the back and forward functionality."""
 
     def test_homepage_no_history(self):
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         self.assertThat(chrome.get_back_button().enabled, Equals(False))
         self.assertThat(chrome.get_forward_button().enabled, Equals(False))
 
     def test_opening_new_page_enables_back_button(self):
-        back_button = self.main_window.get_chrome().get_back_button()
+        back_button = self.main_window.chrome.get_back_button()
         self.assertThat(back_button.enabled, Equals(False))
         url = self.base_url + "/test2"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         self.assertThat(back_button.enabled, Eventually(Equals(True)))
 
     def test_navigating_back_enables_forward_button(self):
         url = self.base_url + "/test2"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         forward_button = chrome.get_forward_button()
         self.assertThat(forward_button.enabled, Equals(False))
         self.pointing_device.click_object(chrome.get_back_button())

=== modified file 'tests/autopilot/webbrowser_app/tests/test_content_pick.py'
--- tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-07-16 11:40:21 +0000
+++ tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-12-13 01:23:19 +0000
@@ -29,7 +29,7 @@
     @unittest.skipIf(model() == "Desktop", "on devices only")
     def test_picker_dialog_shows_up(self):
         url = self.base_url + "/uploadform"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)

=== modified file 'tests/autopilot/webbrowser_app/tests/test_errorsheet.py'
--- tests/autopilot/webbrowser_app/tests/test_errorsheet.py	2014-12-03 18:00:28 +0000
+++ tests/autopilot/webbrowser_app/tests/test_errorsheet.py	2014-12-13 01:23:19 +0000
@@ -29,32 +29,32 @@
     def test_invalid_url_triggers_error_message(self):
         error = self.main_window.get_error_sheet()
         self.assertThat(error.visible, Equals(False))
-        self.go_to_url(INVALID_URL)
+        self.main_window.go_to_url(INVALID_URL)
         self.assertThat(error.visible, Eventually(Equals(True)))
 
     def test_navigating_away_discards_error_message(self):
         error = self.main_window.get_error_sheet()
-        self.go_to_url(INVALID_URL)
+        self.main_window.go_to_url(INVALID_URL)
         self.assertThat(error.visible, Eventually(Equals(True)))
-        self.go_to_url(self.base_url + "/test2")
+        self.main_window.go_to_url(self.base_url + "/test2")
         self.assertThat(error.visible, Eventually(Equals(False)))
 
     def test_navigating_back_discards_error_message(self):
         error = self.main_window.get_error_sheet()
-        self.go_to_url(INVALID_URL)
+        self.main_window.go_to_url(INVALID_URL)
         self.assertThat(error.visible, Eventually(Equals(True)))
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         self.pointing_device.click_object(chrome.get_back_button())
         self.assertThat(error.visible, Eventually(Equals(False)))
 
     def test_navigating_forward_discards_error_message(self):
         error = self.main_window.get_error_sheet()
-        self.go_to_url(INVALID_URL)
+        self.main_window.go_to_url(INVALID_URL)
         self.assert_page_eventually_loaded(INVALID_URL)
         url = self.base_url + "/test2"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         self.pointing_device.click_object(chrome.get_back_button())
         self.assertThat(error.visible, Eventually(Equals(True)))
         self.pointing_device.click_object(chrome.get_forward_button())

=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-10-06 10:35:36 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-12-13 01:23:19 +0000
@@ -40,7 +40,7 @@
     def test_toggle_fullscreen(self):
         self.assert_eventually_windowed()
         url = self.base_url + "/fullscreen"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         self.assert_eventually_windowed()
         webview = self.main_window.get_current_webview()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_geolocation.py'
--- tests/autopilot/webbrowser_app/tests/test_geolocation.py	2014-07-16 09:06:10 +0000
+++ tests/autopilot/webbrowser_app/tests/test_geolocation.py	2014-12-13 01:23:19 +0000
@@ -22,7 +22,7 @@
     def setUp(self):
         super(TestGeolocation, self).setUp()
         url = self.base_url + "/geolocation"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         self.dialog = self.main_window.get_geolocation_dialog()
 

=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
--- tests/autopilot/webbrowser_app/tests/test_history.py	2014-11-19 08:46:19 +0000
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2014-12-13 01:23:19 +0000
@@ -72,6 +72,10 @@
 
     """Test the address bar suggestions based on navigation history."""
 
+    def setUp(self):
+        super().setUp()
+        self.address_bar = self.main_window.address_bar
+
     def assert_suggestions_eventually_shown(self):
         suggestions = self.main_window.get_suggestions()
         self.assertThat(suggestions.opacity, Eventually(Equals(1)))
@@ -84,33 +88,33 @@
         listview = self.main_window.get_suggestions().get_list()
         self.assert_suggestions_eventually_hidden()
         self.assert_suggestions_eventually_hidden()
-        self.focus_address_bar()
+        self.address_bar.focus()
         self.assert_suggestions_eventually_shown()
         self.assertThat(listview.count, Eventually(Equals(1)))
-        self.clear_address_bar()
+        self.address_bar.clear()
         self.assert_suggestions_eventually_hidden()
-        self.type_in_address_bar("u")
+        self.address_bar.write('u')
         self.assert_suggestions_eventually_shown()
         self.assertThat(listview.count, Eventually(Equals(6)))
-        self.type_in_address_bar("b")
+        self.address_bar.write('b', clear=False)
         self.assertThat(listview.count, Eventually(Equals(5)))
-        self.type_in_address_bar("leh")
+        self.address_bar.write('leh', clear=False)
         self.assertThat(listview.count, Eventually(Equals(0)))
-        self.clear_address_bar()
-        self.type_in_address_bar("xaMPL")
+        self.address_bar.clear()
+        self.address_bar.write('xaMPL')
         self.assertThat(listview.count, Eventually(Equals(2)))
 
     def test_clear_address_bar_dismisses_suggestions(self):
-        self.focus_address_bar()
-        self.assert_suggestions_eventually_shown()
-        self.clear_address_bar()
-        self.type_in_address_bar("ubuntu")
-        self.assert_suggestions_eventually_shown()
-        self.clear_address_bar()
+        self.address_bar.focus()
+        self.assert_suggestions_eventually_shown()
+        self.address_bar.clear()
+        self.address_bar.write('ubuntu')
+        self.assert_suggestions_eventually_shown()
+        self.address_bar.clear()
         self.assert_suggestions_eventually_hidden()
 
     def test_addressbar_loosing_focus_dismisses_suggestions(self):
-        self.focus_address_bar()
+        self.address_bar.focus()
         self.assert_suggestions_eventually_shown()
         suggestions = self.main_window.get_suggestions()
         cs = suggestions.globalRect
@@ -123,23 +127,23 @@
         self.assert_suggestions_eventually_hidden()
 
     def test_suggestions_hidden_while_drawer_open(self):
-        self.focus_address_bar()
+        self.address_bar.focus()
         self.assert_suggestions_eventually_shown()
-        chrome = self.main_window.get_chrome()
+        chrome = self.main_window.chrome
         drawer_button = chrome.get_drawer_button()
         self.pointing_device.click_object(drawer_button)
         chrome.get_drawer()
         self.assert_suggestions_eventually_hidden()
-        self.focus_address_bar()
+        self.address_bar.focus()
         self.assert_suggestions_eventually_shown()
 
     def test_select_suggestion(self):
         suggestions = self.main_window.get_suggestions()
         listview = suggestions.get_list()
-        self.focus_address_bar()
+        self.address_bar.focus()
         self.assert_suggestions_eventually_shown()
-        self.clear_address_bar()
-        self.type_in_address_bar("ubuntu")
+        self.address_bar.clear()
+        self.address_bar.write('ubuntu')
         self.assert_suggestions_eventually_shown()
         self.assertThat(listview.count, Eventually(Equals(5)))
         entries = suggestions.get_entries()
@@ -156,8 +160,8 @@
         self.assert_suggestions_eventually_hidden()
 
     def test_special_characters(self):
-        self.clear_address_bar()
-        self.type_in_address_bar("(phil")
+        self.address_bar.clear()
+        self.address_bar.write('(phil')
         self.assert_suggestions_eventually_shown()
         suggestions = self.main_window.get_suggestions()
         listview = suggestions.get_list()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_selection.py'
--- tests/autopilot/webbrowser_app/tests/test_selection.py	2014-06-27 11:51:42 +0000
+++ tests/autopilot/webbrowser_app/tests/test_selection.py	2014-12-13 01:23:19 +0000
@@ -27,7 +27,7 @@
     def setUp(self):
         super(TestSelection, self).setUp()
         url = self.base_url + "/selection"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         webview = self.main_window.get_current_webview()
         self.pointing_device.move_to_object(webview)

=== modified file 'tests/autopilot/webbrowser_app/tests/test_session_save_restore.py'
--- tests/autopilot/webbrowser_app/tests/test_session_save_restore.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_session_save_restore.py	2014-12-13 01:23:19 +0000
@@ -15,7 +15,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from autopilot.matchers import Eventually
-from autopilot.platform import model
 from testtools.matchers import Equals
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
@@ -27,10 +26,7 @@
         self.open_tabs_view()
         self.open_new_tab()
         new_tab_view = self.main_window.get_new_tab_view()
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url(url)
         new_tab_view.wait_until_destroyed()
 
     def test_session_is_saved_and_restored(self):

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2014-12-13 01:23:19 +0000
@@ -48,10 +48,7 @@
         self.open_new_tab()
         new_tab_view = self.main_window.get_new_tab_view()
         url = self.base_url + "/test2"
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url(url)
         new_tab_view.wait_until_destroyed()
 
     def test_close_last_open_tab(self):
@@ -63,7 +60,7 @@
         self.assert_number_webviews_eventually(1)
         self.main_window.get_new_tab_view()
         if model() == 'Desktop':
-            address_bar = self.main_window.get_chrome().get_address_bar()
+            address_bar = self.main_window.address_bar
             self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.url, Equals(""))
@@ -72,10 +69,7 @@
         self.open_new_tab()
         new_tab_view = self.main_window.get_new_tab_view()
         url = self.base_url + "/test2"
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url(url)
         new_tab_view.wait_until_destroyed()
         self.assert_number_webviews_eventually(2)
         self.open_tabs_view()
@@ -98,10 +92,7 @@
         self.check_current_tab("")
         new_tab_view = self.main_window.get_new_tab_view()
         url = self.base_url + "/test2"
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar(url)
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url(url)
         new_tab_view.wait_until_destroyed()
         self.check_current_tab(url)
 
@@ -121,10 +112,7 @@
 
     def test_error_only_for_current_tab(self):
         self.open_new_tab()
-        if model() != 'Desktop':
-            self.focus_address_bar()
-        self.type_in_address_bar("http://invalid")
-        self.keyboard.press_and_release("Enter")
+        self.main_window.go_to_url('http://invalid')
         error = self.main_window.get_error_sheet()
         self.assertThat(error.visible, Eventually(Equals(True)))
 
@@ -140,7 +128,7 @@
 
     def test_open_target_blank_in_new_tab(self):
         url = self.base_url + "/blanktargetlink"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
@@ -149,7 +137,7 @@
 
     def test_open_iframe_target_blank_in_new_tab(self):
         url = self.base_url + "/fulliframewithblanktargetlink"
-        self.go_to_url(url)
+        self.main_window.go_to_url(url)
         self.assert_page_eventually_loaded(url)
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
@@ -157,7 +145,7 @@
         self.assert_number_webviews_eventually(2)
 
     def test_selecting_tab_focuses_webview(self):
-        self.focus_address_bar()
+        self.main_window.address_bar.focus()
         self.open_tabs_view()
         tabs_view = self.main_window.get_tabs_view()
         previews = tabs_view.get_previews()
@@ -165,5 +153,5 @@
         tabs_view.wait_until_destroyed()
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.activeFocus, Eventually(Equals(True)))
-        address_bar = self.main_window.get_chrome().get_address_bar()
+        address_bar = self.main_window.address_bar
         self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_title.py'
--- tests/autopilot/webbrowser_app/tests/test_title.py	2014-11-18 20:03:46 +0000
+++ tests/autopilot/webbrowser_app/tests/test_title.py	2014-12-13 01:23:19 +0000
@@ -25,6 +25,6 @@
     """Tests that the window’s title reflects the page title."""
 
     def test_window_title(self):
-        self.go_to_url(self.base_url + "/test2")
+        self.main_window.go_to_url(self.base_url + "/test2")
         self.assertThat(self.main_window.get_window().title,
                         Eventually(Contains("test page 2")))