Ubuntu Calculator App

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

  1. power_log
  2. Merge into trunk
Proposed by Andrea Cerisara
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 104
Merged at revision: 106
Proposed branch: lp:~acerisara/ubuntu-calculator-app/power_log
Merge into: lp:ubuntu-calculator-app
Diff against target: 43 lines (+21/-1)
2 files modified
app/tests/autopilot/ubuntu_calculator_app/__init__.py (+3/-1)
app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py (+18/-0)
To merge this branch: bzr merge lp:~acerisara/ubuntu-calculator-app/power_log
Reviewer Review Type Date Requested Status
Bartosz Kosiorek Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+249870@code.launchpad.net

Commit message

Added tests for power and log.

Description of the change

Added tests for power and log.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It is working perfectly for me. Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
2--- app/tests/autopilot/ubuntu_calculator_app/__init__.py 2015-02-14 15:37:50 +0000
3+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py 2015-02-16 18:41:20 +0000
4@@ -73,7 +73,9 @@
5 '3': 'threeButton', '4': 'fourButton', '5': 'fiveButton',
6 '6': 'sixButton', '7': 'sevenButton', '8': 'eightButton',
7 '9': 'nineButton', 'bracket': 'universalBracketButton',
8- 'square': 'squareButton', 'cube': 'cubeButton'}
9+ 'square': 'squareButton', 'cube': 'cubeButton',
10+ 'power': 'powerButton', 'log': 'logarithmButton',
11+ 'e': 'eNumberButton'}
12
13 def __init__(self, *args):
14 super(MainView, self).__init__(*args)
15
16=== modified file 'app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
17--- app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-02-14 15:44:36 +0000
18+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-02-16 18:41:20 +0000
19@@ -196,6 +196,24 @@
20
21 self._assert_result_is(u'27')
22
23+ def test_power(self):
24+ self.app.main_view.insert('2')
25+ self.app.main_view.show_scientific_keyboard()
26+ self.app.main_view.press('power')
27+ self.app.main_view.hide_scientific_keyboard()
28+ self.app.main_view.insert('3=')
29+
30+ self._assert_result_is(u'8')
31+
32+ def test_loge(self):
33+ self.app.main_view.show_scientific_keyboard()
34+ self.app.main_view.press('log')
35+ self.app.main_view.press('e')
36+ self.app.main_view.hide_scientific_keyboard()
37+ self.app.main_view.insert('=')
38+
39+ self._assert_result_is(u'1')
40+
41 def _assert_result_is(self, value):
42 self.assertThat(self.app.main_view.get_result,
43 Eventually(Equals(value)))

Subscribers

People subscribed via source and target branches