Merge lp:~pitti/autopilot-gtk/update-tests into lp:autopilot-gtk

[Martin Pitt]

* Update build and test deps for autopilot-legacy
* Replace gnome-system-log test with gnome-calculator test

This adjusts dependencies for the autopilot-legacy rename, and fixes the test
failures due to gnome-system-log changing in between.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-gtk-ci/79/rebuild

review: Approve (continuous-integration)

[Christopher Lee (veebers)]

LGTM, will be good to be able to run this with py3 soon:-)

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-12-18 17:47:19 +0000
+++ debian/control	2014-05-19 14:56:52 +0000
@@ -2,14 +2,15 @@
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Allan LeSage <[e-mail]>
-Build-Depends: autopilot-desktop (>= 1.4),
+Build-Depends: autopilot-desktop-legacy (>= 1.4),
                bamfdaemon,
                at-spi2-core,
                cmake,
                dbus-x11,
                debhelper (>= 9),
-               gnome-system-log,
+               gnome-calculator,
                gsettings-desktop-schemas,
+               gnome-icon-theme-symbolic,
                libglib2.0-dev,
                libgtk-3-dev,
                libxpathselect-dev (>= 1.4),

=== modified file 'debian/tests/control'
--- debian/tests/control	2013-12-18 17:47:19 +0000
+++ debian/tests/control	2014-05-19 14:56:52 +0000
@@ -1,11 +1,12 @@
 Tests: autopilot
 Depends: @,
-         autopilot-desktop (>= 1.4),
+         autopilot-desktop-legacy (>= 1.4),
          bamfdaemon,
          at-spi2-core,
          xvfb,
          dbus-x11,
-         gnome-system-log,
+         gnome-calculator,
          gsettings-desktop-schemas,
+         gnome-icon-theme-symbolic,
          python-gi,
          gir1.2-gtk-3.0

=== renamed file 'tests/autopilot/tests/test_gnome_system_log.py' => 'tests/autopilot/tests/test_gnome_app.py'
--- tests/autopilot/tests/test_gnome_system_log.py	2013-09-27 06:14:10 +0000
+++ tests/autopilot/tests/test_gnome_app.py	2014-05-19 14:56:52 +0000
@@ -1,4 +1,4 @@
-# blackbox testing of autopilot API against gnome-system-log
+# blackbox testing of autopilot API against gnome-calculator
 # Author: Martin Pitt <[e-mail]>
 # Copyright (C) 2013 Canonical Ltd
 #
@@ -17,7 +17,7 @@
 
 from autopilot.testcase import AutopilotTestCase
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals
+from testtools.matchers import Equals
 
 
 class GnomeAppTest(AutopilotTestCase):
@@ -28,39 +28,23 @@
         self.patch_environment('LANGUAGE', '')
         self.patch_environment('LANG', '')
         self.patch_environment('LC_MESSAGES', 'C')
-        self.app = self.launch_test_application('gnome-system-log', '/etc/issue')
-
-    def test_filename_label(self):
-        """Find file name label"""
-
-        l = self.app.select_single('GtkLabel', label=u'<b>issue</b>')
+        self.app = self.launch_test_application('gnome-calculator')
+
+    def test_builder_button(self):
+        """Find button by builder ID"""
+
+        l = self.app.select_single(BuilderName='calc_result_button')
         self.assertNotEqual(l, None)
         self.assertEqual(l.visible, True)
-
-    def test_search(self):
-        """Run a search"""
-
-        revealer = self.app.select_single('GdRevealer')
-        if revealer:
-            # search bar not visible by default
-            self.assertEqual(revealer.child_revealed, False)
-        else:
-            # g-s-l < 3.8 did not have the GdRevealer object yet
-            findbar = self.app.select_single('LogviewFindbar')
-            self.assertEqual(findbar.visible, False)
-
-        search_btn = self.app.select_single('GtkToggleButton')
-        self.assertNotEqual(search_btn, None)
-        self.mouse.click_object(search_btn)
-
-        # should trigger search bar
-        if revealer:
-            self.assertThat(lambda: revealer.child_revealed, Eventually(Equals(True)))
-        else:
-            self.assertThat(lambda: findbar.visible, Eventually(Equals(True)))
-        search = self.app.select_single('GtkSearchEntry', visible=True)
-        self.assertTrue(search.has_focus)
-
-        # something that will not be in /etc/issue
-        self.keyboard.type('Bogus12!')
-        self.app.wait_select_single('GtkLabel', label=u'No matches found')
+        self.assertEqual(l.label, '=')
+
+    def test_calc(self):
+        """Run a calculation"""
+
+        display = self.app.select_single(BuilderName='displayitem')
+        self.mouse.click_object(display)
+        self.assertThat(display.buffer, Equals(''))
+
+        self.keyboard.type('1+1')
+        self.keyboard.press_and_release('Enter')
+        self.assertThat(display.buffer, Eventually(Equals('2')))