Merge lp:~acerisara/ubuntu-calculator-app/sin_cos_factorial into lp:ubuntu-calculator-app

[Andrea Cerisara]

Added tests for sin, cos and factorial.

Added tests for sin, cos and factorial.

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

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

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

In my opinion we should also check if calculation was properly added to Calculation History.

You could do that with command:
  self._assert_history_contains(u'sin(0)=0')

It is important to check history, to get information how historical calculations are stored.

review: Needs Information

[Andrea Cerisara (acerisara)]

No problem, I will add that, thanks :)

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

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

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

It is perfectly fine for me.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-autolanding/63/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2097
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2097/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-autolanding/63

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-autolanding/64/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2119
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-autolanding/64

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-02-16 18:37:03 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-02-23 18:45:42 +0000
@@ -75,7 +75,8 @@
                '9': 'nineButton', 'bracket': 'universalBracketButton',
                'square': 'squareButton', 'cube': 'cubeButton',
                'power': 'powerButton', 'log': 'logarithmButton',
-               'e': 'eNumberButton'}
+               'e': 'eNumberButton', '!': 'factorialNumberButton',
+               'sin': 'sinusButton', 'cos': 'cosButton'}
 
     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	2015-02-16 18:37:03 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-02-23 18:45:42 +0000
@@ -214,6 +214,34 @@
 
         self._assert_result_is(u'1')
 
+    def test_factorial(self):
+        self.app.main_view.insert('4')
+        self.app.main_view.show_scientific_keyboard()
+        self.app.main_view.press('!')
+        self.app.main_view.hide_scientific_keyboard()
+        self.app.main_view.insert('=')
+
+        self._assert_result_is(u'24')
+        self._assert_history_contains(u'4!=24')
+
+    def test_sincos(self):
+        self.app.main_view.show_scientific_keyboard()
+        self.app.main_view.press('sin')
+        self.app.main_view.hide_scientific_keyboard()
+        self.app.main_view.insert('0=')
+
+        self._assert_result_is(u'0')
+        self._assert_history_contains(u'sin(0)=0')
+
+        self.app.main_view.clear()
+        self.app.main_view.show_scientific_keyboard()
+        self.app.main_view.press('cos')
+        self.app.main_view.hide_scientific_keyboard()
+        self.app.main_view.insert('0=')
+
+        self._assert_result_is(u'1')
+        self._assert_history_contains(u'cos(0)=1')
+
     def _assert_result_is(self, value):
         self.assertThat(self.app.main_view.get_result,
                         Eventually(Equals(value)))