Merge lp:~gang65/ubuntu-calculator-app/reboot_fix_temporary_result into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Fix temporarly result and add new autopilot tests to cover that

Fix temporarly result and add new autopilot tests to cover that.

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

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

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

review: Approve (continuous-integration)

[Andrea Cerisara (acerisara)]

Assuming it is fine to switch back from bignumber to number, looks good to me.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'app/engine/math.js'
--- app/engine/math.js	2014-12-24 22:10:30 +0000
+++ app/engine/math.js	2015-01-10 21:38:55 +0000
@@ -115,7 +115,7 @@
 	    matrix: 'matrix',
 
 	    // type of default number output. Choose 'number' (default) or 'bignumber'
-	    number: 'bignumber',
+	    number: 'number',
 
 	    // number of significant digits in BigNumbers
 	    precision: 64,

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-06 19:52:00 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-10 21:38:55 +0000
@@ -66,10 +66,12 @@
     """Calculator MainView Autopilot emulator."""
 
     BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton',
-               '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton',
-               '+': 'plusButton', '1': 'oneButton', '0': 'zeroButton',
-               '/': 'divideButton', '.': 'pointButton', '2': 'twoButton',
-               '5': 'fiveButton', '6': 'sixButton', '-': 'minusButton'}
+               '/': 'divideButton', '.': 'pointButton',
+               '=': 'equalsButton', '-': 'minusButton', '+': 'plusButton',
+               '0': 'zeroButton', '1': 'oneButton', '2': 'twoButton',
+               '3': 'threeButton', '4': 'fourButton', '5': 'fiveButton',
+               '6': 'sixButton', '7': 'sevenButton', '8': 'eightButton',
+               '9': 'nineButton'}
 
     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-01-05 20:44:51 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-01-10 21:38:55 +0000
@@ -13,50 +13,61 @@
     def setUp(self):
         super(MainTestCase, self).setUp()
 
+    def test_temporarly_result(self):
+        self.app.main_view.insert('2450.1*369+')
+
+        self._assert_result_is(u'904086.9+')
+        self.app.main_view.insert('3.1=')
+
+        self._assert_result_is(u'904090')
+        self._assert_history_contains(u'2450.1×369+3.1=9.0409e+5')
+
     def test_operation_after_clear(self):
         self.app.main_view.insert('8*8=')
 
-        self._assert_result_is('64')
-        self._assert_history_contains('8×8=64')
+        self._assert_result_is(u'64')
+        self._assert_history_contains(u'8×8=64')
 
         self.app.main_view.clear()
         self.app.main_view.insert('9*9=')
 
-        self._assert_result_is('81')
-        self._assert_history_contains('9×9=81')
+        self._assert_result_is(u'81')
+        self._assert_history_contains(u'9×9=81')
 
     def test_small_numbers(self):
         self.app.main_view.insert('0.000000001+1=')
-        self._assert_result_is('1.000000001')
+        self._assert_result_is(u'1.000000001')
+        self._assert_history_contains(u'0.000000001+1=1.000000001')
 
         self.app.main_view.clear()
 
         self.app.main_view.insert('0.000000001/10=')
-        self._assert_result_is('1e−10')
+        self._assert_result_is(u'1e−10')
+        self._assert_history_contains(u'0.000000001÷10=1e-10')
 
     def test_operators_precedence(self):
         self.app.main_view.insert('2+2*2=')
 
-        self._assert_result_is('6')
-        self._assert_history_contains('2+2×2=6')
+        self._assert_result_is(u'6')
+        self._assert_history_contains(u'2+2×2=6')
 
         self.app.main_view.clear()
         self.app.main_view.insert('2-2*2=')
 
-        self._assert_result_is('−2')
-        self._assert_history_contains('2−2×2=-2')
+        self._assert_result_is(u'−2')
+        self._assert_history_contains(u'2−2×2=-2')
 
         self.app.main_view.clear()
         self.app.main_view.insert('5+6/2=')
 
-        self._assert_result_is('8')
-        self._assert_history_contains('5+6÷2=8')
+        self._assert_result_is(u'8')
+        self._assert_history_contains(u'5+6÷2=8')
 
     def test_divide_with_zero(self):
         self.app.main_view.insert('0/5=')
 
-        self._assert_result_is('0')
-        self._assert_history_contains('0÷5=0')
+        self._assert_result_is(u'0')
+        self._assert_history_contains(u'0÷5=0')
 
     def test_divide_by_zero(self):
         self.app.main_view.insert('5/0=')
@@ -67,7 +78,7 @@
     def test_divide_zero_by_zero(self):
         self.app.main_view.insert('0/0=')
 
-        self._assert_result_is("NaN")
+        self._assert_result_is(u"NaN")
         self._assert_history_contains(u'0÷0=NaN')
 
     def _assert_result_is(self, value):