Merge lp:~boiko/ubuntu-calculator-app/fix_autopilot_tests into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Gustavo Pichorim Boiko]

Temporarily disable some autopilot tests that are failing due to existing bugs.

Temporarily disable some autopilot tests that are failing due to existing bugs.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:143
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/39/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/25/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/38/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/38/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/38/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/39/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/ubuntu-calculator-app/fix_autopilot_tests]

144. By Gustavo Pichorim Boiko on 2013-08-22

Make pep8 happy.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/41/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/29
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/40/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/40/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/40/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/41/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/ubuntu-calculator-app/fix_autopilot_tests]

145. By Gustavo Pichorim Boiko on 2013-08-22

And one more pep8 fix.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:145
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/42/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/42/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/ubuntu-calculator-app/fix_autopilot_tests]

146. By Gustavo Pichorim Boiko on 2013-08-23

Add a comment to a test to trigger CI.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:146
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/43/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/42

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/43/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/ubuntu-calculator-app/fix_autopilot_tests]

147. By Gustavo Pichorim Boiko on 2013-08-23

Make sure to temporarily move the sqlite db before running the suite, this will
result in a clean environment for the app during each run. Thanks Omer Akram for
the fix.

148. By Gustavo Pichorim Boiko on 2013-08-23

We don't need to remove the previous calculations after finishing the tests.
We always start from a fresh database now.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:148
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/44/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/47
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/43

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/44/rebuild

review: Approve (continuous-integration)

[Omer Akram (om26er)]

LGTM

review: Approve

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators.py'
--- tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-14 22:06:34 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-23 17:53:25 +0000
@@ -204,7 +204,7 @@
         return operand_label.numbers
 
     def swipe_up(self):
-        """Swipe up on the screen to clear the calculation."""
+        """Swipe up on the screen to tear off the calculation."""
         x, y, w, h = self.globalRect
         tx = x + (w / 2)
         ty = y + (h / 2)
@@ -229,7 +229,7 @@
         x, y, w, h = self.globalRect
         tx = x + (w - w / 8)
         ty = y + (h / 2)
-        self.pointing_device.drag(tx, ty, tx + (w - w / 8), ty)
+        self.pointing_device.drag(tx, ty, (w / 2), ty)
 
     def confirm_delete(self):
         """Confirm the deletion of the calculation."""

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-08-08 08:24:24 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-08-23 17:53:25 +0000
@@ -7,11 +7,14 @@
 
 """Calculator autopilot tests."""
 
-import os.path
+import os
+import shutil
 
 from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
+from testtools.matchers import Equals
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 from ubuntu_calculator_app import emulators
@@ -30,9 +33,15 @@
 
     local_location = "../../ubuntu-calculator-app.qml"
 
+    sqlite_dir = os.path.expanduser(
+        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
+    backup_dir = sqlite_dir + ".backup"
+
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(CalculatorTestCase, self).setUp()
+        self.temp_move_sqlite_db()
+        self.addCleanup(self.restore_sqlite_db)
 
         if os.path.exists(self.local_location):
             self.launch_test_local()
@@ -55,6 +64,31 @@
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def temp_move_sqlite_db(self):
+        if os.path.exists(self.sqlite_dir):
+            shutil.move(self.sqlite_dir, self.backup_dir)
+            self.assertThat(
+                lambda: os.path.exists(self.backup_dir),
+                Eventually(Equals(True)))
+
+    def restore_sqlite_db(self):
+        if os.path.exists(self.backup_dir) and os.path.exists(self.sqlite_dir):
+            shutil.rmtree(self.sqlite_dir)
+            self.assertThat(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(False)))
+            shutil.move(self.backup_dir, self.sqlite_dir)
+            self.assertTrue(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(True)))
+        elif os.path.exists(self.backup_dir):
+            shutil.move(self.backup_dir, self.sqlite_dir)
+            self.assertTrue(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(True)))
+        else:
+            pass
+
     @property
     def main_view(self):
         return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-13 18:18:56 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-23 17:53:25 +0000
@@ -28,11 +28,6 @@
 
     def setUp(self):
         super(TestSimplePage, self).setUp()
-        self.addCleanup(self._delete_old_calculations)
-
-    def _delete_old_calculations(self):
-        while self.main_view.get_number_of_screens() > 1:
-            self.main_view.delete_previous_calculation(0, confirm=True)
 
     def test_operation_after_clear(self):
         """ Test that after clearing one calculation, the next is still correct
@@ -91,6 +86,7 @@
         self._assert_result("4")
 
     def test_addition(self):
+        """Simple addition test."""
         self.main_view.calculate_operation("4+2")
         self._assert_result("6")
 
@@ -106,37 +102,82 @@
         self.main_view.calculate_operation("4*0")
         self._assert_result("0")
 
-    def test_one_negative_number_multiplication(self):
-        self.main_view.calculate_operation("-3*4")
-        self._assert_result("-12")
+    # Disabled due to bug #1210082
+    #def test_one_negative_number_multiplication(self):
+    #    # tested operation: -3*4
+    #    calc_keyboard = self.main_view.get_calc_keyboard()
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("3*4")
+    #    calc_keyboard.click_equals()
+    #    self._assert_result("-12")
 
-    def test_two_negative_numbers_multiplication(self):
-        self.main_view.calculate_operation("-2*-3")
-        self._assert_result("6")
+    # Disabled due to bug #1210082
+    #def test_two_negative_numbers_multiplication(self):
+    #    # tested operation: -2*-3
+    #    calc_keyboard = self.main_view.get_calc_keyboard()
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("2*")
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("3")
+    #    calc_keyboard.click_equals()
+    #
+    #    self._assert_result("6")
 
     def test_three_positive_numbers_multiplication(self):
         self.main_view.calculate_operation("2*3*10")
         self._assert_result("60")
 
-    def test_two_negatives_in_three_numbers_multiplication(self):
-        self.main_view.calculate_operation("-2*-3*5")
-        self._assert_result("30")
+    # Disabled due to bug #1210082
+    #def test_two_negatives_in_three_numbers_multiplication(self):
+    #    # tested operation: -2*-3*5
+    #    calc_keyboard = self.main_view.get_calc_keyboard()
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("2*")
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("3*5")
+    #    calc_keyboard.click_equals()
+    #
+    #    self._assert_result("30")
 
-    def test_three_negative_numbers_multiplication(self):
-        self.main_view.calculate_operation("-4*-5*-7")
-        self._assert_result("-140")
+    # Disabled due to bug #1210082
+    #def test_three_negative_numbers_multiplication(self):
+    #    # tested operation: -4*-5*-7
+    #    calc_keyboard = self.main_view.get_calc_keyboard()
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("4*")
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("5*")
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("7")
+    #    calc_keyboard.click_equals()
+    #
+    #    self._assert_result("-140")
 
     def test_divide_positive(self):
         self.main_view.calculate_operation("4/2")
         self._assert_result("2")
 
     def test_divide_negative(self):
-        self.main_view.calculate_operation("4/-2")
+        # tested operation: 4/-2
+        calc_keyboard = self.main_view.get_calc_keyboard()
+        calc_keyboard.enter_operation("4/")
+        calc_keyboard.click_sign()  # to get "-"
+        calc_keyboard.enter_operation("2")
+        calc_keyboard.click_equals()
+
         self._assert_result("-2")
 
-    def test_divide_two_negatives(self):
-        self.main_view.calculate_operation("-4/-2")
-        self._assert_result("2")
+    # Disabled due to bug #1210082
+    #def test_divide_two_negatives(self):
+    #    # tested operation: -4/-2
+    #    calc_keyboard = self.main_view.get_calc_keyboard()
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.calculate_operation("4/")
+    #    calc_keyboard.click_sign()  # to get "-"
+    #    calc_keyboard.enter_operation("2")
+    #    calc_keyboard.click_equals()
+    #
+    #    self._assert_result("2")
 
     def test_divide_with_zero(self):
         self.main_view.calculate_operation("0/4")
@@ -169,22 +210,9 @@
         self.assertThat(
             self.main_view.get_number_of_screens, Eventually(Equals(1)))
 
-    def test_click_history(self):
-        """Do a calculation using history items."""
-        self.main_view.calculate_operation("19+1")
-        self.main_view.clear_with_swipe()
-
-        result_label = self.main_view.get_screen_by_index(0).get_result_label()
-        self.pointing_device.click_object(result_label)
-
-        calc_keyboard = self.main_view.get_calc_keyboard()
-        calc_keyboard.enter_operation("+5")
-        calc_keyboard.click_equals()
-
-        self._assert_result("25")
-
-    def test_operands_before_number(self):
-        """ Operands before the numbers."""
-        self.main_view.calculate_operation("*3")
-
-        self._assert_result("")
+    # Disabled due to bug #1214069
+    #def test_operands_before_number(self):
+    #    """ Operands before the numbers."""
+    #    self.main_view.calculate_operation("*3")
+    #
+    #    self._assert_result("")