Merge lp:~acerisara/ubuntu-calculator-app/operators-precedence into lp:ubuntu-calculator-app

[Andrea Cerisara]

Added test for operators precedence.

Added test for operators precedence.

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

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/21/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/501
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/501/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/21

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Works perfectly for me (we only need history validator, but it was stated in prerequisite review: https://code.launchpad.net/~acerisara/ubuntu-calculator-app/operation-after-clear)

Thanks Andrea.

review: Approve

[Andrea Cerisara (acerisara)]

We are also planning to backport the tests from the current app (what it makes sense at least) https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1404634, stay tuned! :)

[Andrea Cerisara (acerisara)]

Bartosz, can we merge this stuff into master? Or do we need to wait the approval from Nicholas?

[Bartosz Kosiorek (gang65)]

It is working perfectly for me, except checking adding to history.
I think we could merge it without bothering Nicholas. The changes introduced here are quite simle, and it was done in similar way for old calculator implementation.

review: Approve

[Riccardo Padovani (rpadovani)]

Bartosz, feel free to top approve too next time :-)

review: Approve

[lp:~acerisara/ubuntu-calculator-app/operators-precedence]

47. By Andrea Cerisara on 2014-12-29

Merged trunk; refactoring.

[Riccardo Padovani (rpadovani)]

Top approving after trunk merging

review: Approve

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-12-29 09:11:58 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-12-29 09:11:58 +0000
@@ -68,7 +68,8 @@
     BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton',
                '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton',
                '+': 'plusButton', '1': 'oneButton', '0': 'zeroButton',
-               '/': 'divideButton', '.': 'pointButton'}
+               '/': 'divideButton', '.': 'pointButton', '2': 'twoButton',
+               '5': 'fiveButton', '6': 'sixButton', '-': 'minusButton'}
 
     def __init__(self, *args):
         super(MainView, self).__init__(*args)

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2014-12-29 09:11:58 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2014-12-29 09:11:58 +0000
@@ -38,3 +38,27 @@
         self.app.main_view.insert('0.000000001/10=')
         self.assertThat(self.app.main_view.get_result,
                         Eventually(Equals('1e−10')))
+
+    def test_operators_precedence(self):
+        self.app.main_view.insert('2+2*2=')
+        self.assertThat(self.app.main_view.get_result,
+                        Eventually(Equals('6')))
+
+        self.assertTrue(self.app.main_view.get_history().contains('2+2×2=6'))
+
+        self.app.main_view.clear()
+
+        self.app.main_view.insert('2-2*2=')
+        self.assertThat(self.app.main_view.get_result,
+                        Eventually(Equals('−2')))
+
+        self.assertTrue(self.app.main_view.get_history().contains('2−2×2=-2'))
+
+        self.app.main_view.clear()
+
+        self.app.main_view.insert('5+6/2=')
+
+        self.assertThat(self.app.main_view.get_result,
+                        Eventually(Equals('8')))
+
+        self.assertTrue(self.app.main_view.get_history().contains('5+6÷2=8'))