Merge lp:~rpadovani/ubuntu-calculator-app/fixed-test into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Update delete test to new UX (you have to click delete button)
Fixed tear off test (before was alway true for a wrong implementation, now it's a real test)

Update delete test to new UX (you have to click delete button)
Fixed tear off test (before was alway true for a wrong implementation, now it's a real test)

[lp:~rpadovani/ubuntu-calculator-app/fixed-test]

109. By Riccardo Padovani on 2013-07-15

Little improvment to tear off test

[Gustavo Pichorim Boiko (boiko)]

The code looks good. I am just wondering if the numbers might be different in another language and thus the representation won't be "14" anymore, but still, it is better than the previous code, approving.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-07-15 15:09:20 +0000
+++ Simple/Screen.qml	2013-07-15 21:52:26 +0000
@@ -120,7 +120,7 @@
             }
 
            Button {
-               text: i18n.tr("Delete")
+                text: i18n.tr("Delete")
                 width: parent.width
                 onClicked: root.removeItem()
            }

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py	2013-07-14 21:18:06 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py	2013-07-15 21:52:26 +0000
@@ -17,8 +17,8 @@
     def get_formula_label(self):
         return self.app.select_single('CalcLabel', isLast=True)
 
-    def get_calc_label(self, label_id):
-    	return self.app.select_single('CalcLabel', id=label_id)
+    def get_calc_label(self, numbers):
+    	return self.app.select_single('CalcLabel', numbers=numbers)
 
     def get_screen(self):
         return self.app.select_many("Screen")[0]

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-07-14 22:05:48 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-07-15 21:52:26 +0000
@@ -80,6 +80,11 @@
         ty = y + (w / 2)
 
         self.pointing_device.drag(tx + h / 3 , ty + w / 3, tx - h / 3, ty + w / 3)
+        self.pointing_device.drag(tx, ty, tx, ty + w / 3)
+        self.pointing_device.move(tx, ty + 1.3 * (w / 10))
+
+        self.pointing_device.click()
+        self.pointing_device.click() # Second one is necessary to have the time to drag
 
     def _click_buttons(self, input_):
         for char in input_:
@@ -195,21 +200,15 @@
 
     def test_tear_off(self):
         """Test tear off adds calculation to history"""
-        # Take the label id
-        label_id = self.simple_page.get_formula_label().id
-
         # Do the calc
         self._tear_off("9+5")
 
         # Check if has been saved
-        label = lambda: self.simple_page.get_calc_label(label_id)
-        self.assertThat(label, Eventually(NotEquals(label_id)))
+        label = lambda: self.simple_page.get_calc_label("14")
+        self.assertThat(label, Eventually(NotEquals(None)))
 
     def test_swipe_delete_calculation_right_left(self):
         """Try to delete a calculation swiping it from right to left"""
-        # Take the label id
-        label_id = self.simple_page.get_formula_label().id
-
         # Do the calc
         self._tear_off("9+5")
 
@@ -217,5 +216,5 @@
         self._delete_last_calculation()
 
         # Check if has been deleted
-        label = lambda: self.simple_page.get_calc_label(label_id)
+        label = lambda: self.simple_page.get_calc_label("14")
         self.assertThat(label, Eventually(Equals(None)))
\ No newline at end of file