Merge lp:~boiko/ubuntu-calculator-app/add_tests_for_new_formula into lp:~f-riccardo87/ubuntu-calculator-app/new-formula-structure

[Gustavo Pichorim Boiko]

Add tests for the bugs fixed by the new formula structure.

Add tests for the bugs fixed by the new formula structure.

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

49. By Gustavo Pichorim Boiko on 2013-04-10

Add the bugnumber reference in the testcase.

[Riccardo Ferrazzo (f-riccardo87)]

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-03-19 17:52:36 +0000
+++ Simple/CalcLabel.qml	2013-04-10 21:46:22 +0000
@@ -14,6 +14,7 @@
     property string labelText: ""
     property int numbersHeight: units.gu(4)
     property string numbersColor: '#757373'
+    property bool isLast: false
 
     Row{
         id: row
@@ -39,6 +40,12 @@
         }
         Label {
             id: formulaLabel
+
+            // this property is used by autopilot tests to find the correct item
+            // FIXME: implement it in a better way
+            property bool isLast: root.isLast
+
+            objectName: "formulaLabel"
             width: units.gu(25)
             color: numbersColor
             anchors.bottom: parent.bottom

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-03-20 16:28:57 +0000
+++ Simple/Screen.qml	2013-04-10 21:46:22 +0000
@@ -77,6 +77,7 @@
                         operation: _operation
                         numbersColor: (isLastItem && index === repeater.model.count-1) ? "#dd4814" : "#757373"
                         numbersHeight: (isLastItem && index === repeater.model.count-1) ? units.gu(7) : units.gu(4)
+                        isLast: (isLastItem && index === repeater.model.count-1)
 
                         onLabelTextChanged: {
                             root.labelTextUpdated(index, labelText)

=== renamed file 'tests/autopilot/ubuntu_calculator_app/emulators/main_buttons.py' => 'tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/emulators/main_buttons.py	2013-03-22 12:15:46 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py	2013-04-10 21:46:22 +0000
@@ -4,3 +4,15 @@
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
+
+class SimplePage(object):
+    """An emulator class that makes it easy to interact with the call panel."""
+    def __init__(self, app):
+        self.app = app
+
+    def get_button(self, text):
+        return self.app.select_single('KeyboardButton', text=text)
+
+    def get_formula_label(self):
+        # FIXME: find a better way to find the latest formula label
+        return self.app.select_single('Label', objectName='formulaLabel', isLast=True)

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-03-22 12:15:46 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-04-10 21:46:22 +0000
@@ -17,22 +17,22 @@
 
 class CalculatorTestCase(AutopilotTestCase, QtIntrospectionTestMixin):
 
-	"""A common testcase class that provides useful methods for calculator app."""
-
-	def setUp(self):
-		super(CalculatorTestCase, self).setUp()
-
-		if os.path.realpath(__file__).startswith("/usr/"):
+    """A common testcase class that provides useful methods for calculator app."""
+
+    def setUp(self):
+        super(CalculatorTestCase, self).setUp()
+
+        if os.path.realpath(__file__).startswith("/usr/"):
             self.launch_test_installed()
         else:
             self.launch_test_local()
 
     def launch_test_local(self):
-    	self.app = self.launch_test_application(
-    		"qmlscene", "../../ubuntu-calculator-app.qml"
-    		)
+        self.app = self.launch_test_application(
+            "qmlscene", "../../ubuntu-calculator-app.qml"
+            )
 
     def launch_test_installed(self):
-    	self.app = self.launch_test_application(
-    		"ubuntu-calculator-app"
-    		)
+        self.app = self.launch_test_application(
+            "ubuntu-calculator-app"
+            )

=== renamed file 'tests/autopilot/ubuntu_calculator_app/tests/test_main_buttons.py' => 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_main_buttons.py	2013-03-22 14:17:43 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-04-10 21:46:22 +0000
@@ -14,16 +14,84 @@
 from autopilot.matchers import Eventually
 
 from ubuntu_calculator_app.tests import CalculatorTestCase
-
-
-class TestMainButtons(CalculatorTestCase):
-
-	def setUp(self):
-		super(TestMainButtons, self).setUp()
-
-	def test_this(self):
-		buttons = self.app.select_many("KeyboardButton")
-
-		for keys in buttons:
-			self.pointing_device.move_to_object(keys)
-			self.pointing_device.click()
+from ubuntu_calculator_app.emulators.simple_page import SimplePage
+
+class TestSimplePage(CalculatorTestCase):
+
+    def setUp(self):
+        super(TestSimplePage, self).setUp()
+
+    def test_this(self):
+        buttons = self.app.select_many("KeyboardButton")
+
+        for keys in buttons:
+            self.pointing_device.move_to_object(keys)
+            self.pointing_device.click()
+
+    def test_operation_after_clear(self):
+        """ Test that after clearing one calculation, the next is still correct (bug #1164973) """
+        oneButton = self.simple_page.get_button("1")
+        plusButton = self.simple_page.get_button("+")
+        equalsButton = self.simple_page.get_button("=")
+        clearButton = self.simple_page.get_button("C")
+
+        # type 1+1=
+        self.pointing_device.move_to_object(oneButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(plusButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(oneButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(equalsButton)
+        self.pointing_device.click()
+
+        # make sure the result is already there
+        self.assertThat(self.simple_page.get_formula_label().text, Eventually(Equals("2")))
+
+        # now clear the input by pressing "C" three times
+        self.pointing_device.move_to_object(clearButton)
+        self.pointing_device.click()
+        self.pointing_device.click()
+        self.pointing_device.click()
+
+        # and do the operation again to make sure the result is correct
+        self.pointing_device.move_to_object(oneButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(plusButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(oneButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(equalsButton)
+        self.pointing_device.click()
+
+        # make sure the result is correct
+        self.assertThat(self.simple_page.get_formula_label().text, Eventually(Equals("2")))
+
+    def test_equals_dont_change_numbers(self):
+        """ Test that typing a number and pressing "=" won't change the number (bug #1165894) """
+        oneButton = self.simple_page.get_button("1")
+        twoButton = self.simple_page.get_button("2")
+        threeButton = self.simple_page.get_button("3")
+        equalsButton = self.simple_page.get_button("=")
+
+        # type the initial number
+        self.pointing_device.move_to_object(oneButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(twoButton)
+        self.pointing_device.click()
+        self.pointing_device.move_to_object(threeButton)
+        self.pointing_device.click()
+
+        # check that the label is displaying correctly
+        self.assertThat(self.simple_page.get_formula_label().text, Eventually(Equals("123")))
+
+        # click the "=" button
+        self.pointing_device.move_to_object(equalsButton)
+        self.pointing_device.click()
+
+        # check that the label is still displaying correctly
+        self.assertThat(self.simple_page.get_formula_label().text, Eventually(Equals("123")))
+
+    @property
+    def simple_page(self):
+        return SimplePage(self.app)