Ubuntu Calculator App

Merge lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-convergance into lp:ubuntu-calculator-app

  1. ubuntu-calculator-convergance
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 244
Merged at revision: 246
Proposed branch: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-convergance
Merge into: lp:ubuntu-calculator-app
Diff against target: 165 lines (+5/-30)
4 files modified
app/ubuntu-calculator-app.qml (+2/-2)
debian/changelog (+2/-1)
tests/autopilot/run (+1/-1)
tests/autopilot/ubuntu_calculator_app/tests/test_main.py (+0/-26)
To merge this branch: bzr merge lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-convergance
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Riccardo Padovani Approve
Review via email: mp+278880@code.launchpad.net

Commit message

Run Calculator in Landscape mode for Desktop (LP: #1468663)

Description of the change

 Run Calculator in Landscape mode for Desktop (LP: #1468663)

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

PASSED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/32/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/194/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Yeah, great :-)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-autolanding/94/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1341/console

review: Needs Fixing (continuous-integration)
lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-convergance updated
244. By Bartosz Kosiorek

Resolve merge conflict

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ubuntu-calculator-app.qml'
2--- app/ubuntu-calculator-app.qml 2015-11-28 20:37:20 +0000
3+++ app/ubuntu-calculator-app.qml 2015-11-28 20:44:31 +0000
4@@ -34,8 +34,8 @@
5 automaticOrientation: true
6 anchorToKeyboard: textInputField.visible ? false : true
7
8- width: units.gu(40);
9- height: units.gu(70);
10+ width: units.gu(80);
11+ height: units.gu(60);
12
13 // This is our engine
14 property var mathJs: MathJs.mathJs;
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2015-11-27 11:57:09 +0000
18+++ debian/changelog 2015-11-28 20:44:31 +0000
19@@ -3,7 +3,8 @@
20 [ Bartosz Kosiorek ]
21 * Fix evaluation of long complex numbers (LP: #1515600)
22 * Upgrade math.js to version 2.4.2 to fix complex numbers formatting
23- * Add instruction how to enable profiling (workaround for LP: #1520551)
24+ * Run Calculator in Landscape mode for Desktop (LP: #1468663)
25+ * Add instruction how to enable profiling (workaround for LP: #1520551)
26
27 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Thu, 12 Nov 2015 13:28:29 +0100
28
29
30=== modified file 'tests/autopilot/run'
31--- tests/autopilot/run 2014-12-20 19:36:32 +0000
32+++ tests/autopilot/run 2015-11-28 20:44:31 +0000
33@@ -1,6 +1,6 @@
34 #!/bin/bash
35
36-if [[ -z `which autopilot` ]]; then
37+if [[ -z `which autopilot3` ]]; then
38 echo "Autopilot is not installed. Skip"
39 exit
40 fi
41
42=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
43--- tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-11-22 13:59:30 +0000
44+++ tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-11-28 20:44:31 +0000
45@@ -238,30 +238,24 @@
46
47 def test_square(self):
48 self.app.main_view.insert('4')
49- self.app.main_view.show_scientific_keyboard()
50 self.app.main_view.press('square')
51- self.app.main_view.hide_scientific_keyboard()
52 self.app.main_view.insert('=')
53
54 self._assert_result_is(u'16')
55 self._assert_history_contains(u'4^2=16')
56
57 def test_adding_square_to_empty_formula(self):
58- self.app.main_view.show_scientific_keyboard()
59 self.app.main_view.press('square')
60 self._assert_result_is(u'')
61
62 def test_adding_square_after_operator(self):
63 self.app.main_view.insert('6/')
64- self.app.main_view.show_scientific_keyboard()
65 self.app.main_view.press('square')
66 self._assert_result_is(u'6÷')
67
68 def test_cube(self):
69 self.app.main_view.insert('3')
70- self.app.main_view.show_scientific_keyboard()
71 self.app.main_view.press('cube')
72- self.app.main_view.hide_scientific_keyboard()
73 self.app.main_view.insert('=')
74
75 self._assert_result_is(u'27')
76@@ -269,28 +263,22 @@
77
78 def test_power(self):
79 self.app.main_view.insert('2')
80- self.app.main_view.show_scientific_keyboard()
81 self.app.main_view.press('power')
82- self.app.main_view.hide_scientific_keyboard()
83 self.app.main_view.insert('-4=')
84
85 self._assert_result_is(u'0.0625')
86 self._assert_history_contains(u'2^−4=0.0625')
87
88 def test_loge(self):
89- self.app.main_view.show_scientific_keyboard()
90 self.app.main_view.press('log')
91 self.app.main_view.press('e')
92- self.app.main_view.hide_scientific_keyboard()
93 self.app.main_view.insert('=')
94
95 self._assert_result_is(u'1')
96
97 def test_factorial(self):
98 self.app.main_view.insert('4')
99- self.app.main_view.show_scientific_keyboard()
100 self.app.main_view.press('!')
101- self.app.main_view.hide_scientific_keyboard()
102 self.app.main_view.insert('=')
103
104 self._assert_result_is(u'24')
105@@ -299,9 +287,7 @@
106 def test_factorial_with_brackets(self):
107 self.app.main_view.press_universal_bracket()
108 self.app.main_view.insert('3')
109- self.app.main_view.show_scientific_keyboard()
110 self.app.main_view.press('!')
111- self.app.main_view.hide_scientific_keyboard()
112 self.app.main_view.insert('*2')
113 self.app.main_view.press_universal_bracket()
114 self.app.main_view.insert('=')
115@@ -310,18 +296,14 @@
116 self._assert_history_contains(u'(3!×2)=12')
117
118 def test_sin(self):
119- self.app.main_view.show_scientific_keyboard()
120 self.app.main_view.press('sin')
121- self.app.main_view.hide_scientific_keyboard()
122 self.app.main_view.insert('0=')
123
124 self._assert_result_is(u'0')
125 self._assert_history_contains(u'sin(0)=0')
126
127 def test_cos(self):
128- self.app.main_view.show_scientific_keyboard()
129 self.app.main_view.press('cos')
130- self.app.main_view.hide_scientific_keyboard()
131 self.app.main_view.insert('0')
132 self.app.main_view.press_universal_bracket()
133 self.app.main_view.insert('=')
134@@ -331,16 +313,12 @@
135
136 def test_validation_complex_numbers(self):
137 self.app.main_view.insert('66')
138- self.app.main_view.show_scientific_keyboard()
139 self.app.main_view.press('i')
140- self.app.main_view.hide_scientific_keyboard()
141 self.app.main_view.insert('*')
142- self.app.main_view.show_scientific_keyboard()
143 self.app.main_view.press('i')
144 self.app.main_view.press('i')
145 self.app.main_view.press('i')
146 self._assert_result_is(u'66i×i')
147- self.app.main_view.hide_scientific_keyboard()
148 self.app.main_view.insert('33=')
149 self._assert_result_is(u'−66')
150 self._assert_history_contains(u'66i×i=−66')
151@@ -348,14 +326,10 @@
152 def test_formatting_long_complex_numbers(self):
153 self.app.main_view.press_universal_bracket()
154 self.app.main_view.insert('3+4')
155- self.app.main_view.show_scientific_keyboard()
156 self.app.main_view.press('i')
157- self.app.main_view.hide_scientific_keyboard()
158 self.app.main_view.press_universal_bracket()
159 self._assert_result_is(u'(3+4i)')
160- self.app.main_view.show_scientific_keyboard()
161 self.app.main_view.press('square')
162- self.app.main_view.hide_scientific_keyboard()
163 self.app.main_view.insert('=')
164 self._assert_result_is(u'−6.999999999999997+24i')
165 self._assert_history_contains(u'(3+4i)^2=−6.999999999999997+24i')

Subscribers

People subscribed via source and target branches