Merge lp:~rpadovani/ubuntu-calculator-app/1188716bis into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Added test to check if a calc is saved when you close and reopen the app

Added test to check if a calc is saved when you close and reopen the app

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

PASSED: Continuous integration, rev:117
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/13/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/5
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/5

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Excellent. This fills in the final needed testcase. We'll have to see what happens with the issue of sending the kill signal. For now, let's add it :-)

review: Approve

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-07-17 13:53:51 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-07-31 09:23:42 +0000
@@ -16,6 +16,8 @@
 from ubuntu_calculator_app.tests import CalculatorTestCase
 from ubuntu_calculator_app.emulators.simple_page import SimplePage
 
+import os.path
+
 
 class TestSimplePage(CalculatorTestCase):
 
@@ -95,6 +97,38 @@
         self.assertThat(
             get_result, Eventually(Equals(expected_result)))
 
+    def _close_and_reopen(self):
+        # See #1188292, there is a bug in SDK that prevents to use terminate
+        #self.simple_page.app.process.terminate()
+        #self.simple_page.app.process.wait()
+    
+        screen = self.simple_page.get_screen()
+        x, y, h, w = screen.globalRect
+
+        self.pointing_device.move(x + (h / 25), y + w / 2.7)
+        self.pointing_device.click()
+        
+        self.simple_page.app.process.wait()
+
+        local_location = "../../ubuntu-calculator-app.qml"
+
+        # Yes, I know, it's a duplication of CalculatorTestCase().setUp(), but I didn't find a better way to implement it
+        if os.path.exists(self.local_location):
+            self.app = self.launch_test_application(
+                "qmlscene",
+                self.local_location,
+                app_type='qt')
+        else:
+            self.app = self.launch_test_application(
+                "qmlscene",
+                "/usr/share/ubuntu-calculator-app/ubuntu-calculator-app.qml",
+                "--desktop_file_hint="
+                "/usr/share/applications/ubuntu-calculator-app.desktop",
+                app_type='qt')
+
+        # Check if windows has been launch
+        self.assertThat(self.simple_page.app.select_single("QQuickView").visible, Eventually(Equals(True)))
+
     def test_equals_dont_change_numbers(self):
         """ Test that typing a number and pressing "=" won't change the number
         (bug #1165894).
@@ -229,4 +263,13 @@
         self.pointing_device.click_object(calc)
 
         self._calculate("+5")
-        self._assert_result("25")
 \ No newline at end of file
+        self._assert_result("25")
+
+    def test_save_calculation_between_reload(self):
+        # Do the calc
+        self._tear_off("44-2")
+
+        self._close_and_reopen()
+
+        label = lambda: self.simple_page.get_calc_label("42")
+        self.assertThat(label, Eventually(NotEquals(None)))
 \ No newline at end of file