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
=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml 2015-11-28 20:37:20 +0000
+++ app/ubuntu-calculator-app.qml 2015-11-28 20:44:31 +0000
@@ -34,8 +34,8 @@
34 automaticOrientation: true34 automaticOrientation: true
35 anchorToKeyboard: textInputField.visible ? false : true35 anchorToKeyboard: textInputField.visible ? false : true
3636
37 width: units.gu(40);37 width: units.gu(80);
38 height: units.gu(70);38 height: units.gu(60);
3939
40 // This is our engine40 // This is our engine
41 property var mathJs: MathJs.mathJs;41 property var mathJs: MathJs.mathJs;
4242
=== modified file 'debian/changelog'
--- debian/changelog 2015-11-27 11:57:09 +0000
+++ debian/changelog 2015-11-28 20:44:31 +0000
@@ -3,7 +3,8 @@
3 [ Bartosz Kosiorek ]3 [ Bartosz Kosiorek ]
4 * Fix evaluation of long complex numbers (LP: #1515600)4 * Fix evaluation of long complex numbers (LP: #1515600)
5 * Upgrade math.js to version 2.4.2 to fix complex numbers formatting 5 * Upgrade math.js to version 2.4.2 to fix complex numbers formatting
6 * Add instruction how to enable profiling (workaround for LP: #1520551)6 * Run Calculator in Landscape mode for Desktop (LP: #1468663)
7 * Add instruction how to enable profiling (workaround for LP: #1520551)
78
8 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Thu, 12 Nov 2015 13:28:29 +01009 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Thu, 12 Nov 2015 13:28:29 +0100
910
1011
=== modified file 'tests/autopilot/run'
--- tests/autopilot/run 2014-12-20 19:36:32 +0000
+++ tests/autopilot/run 2015-11-28 20:44:31 +0000
@@ -1,6 +1,6 @@
1#!/bin/bash1#!/bin/bash
22
3if [[ -z `which autopilot` ]]; then3if [[ -z `which autopilot3` ]]; then
4 echo "Autopilot is not installed. Skip"4 echo "Autopilot is not installed. Skip"
5 exit5 exit
6fi6fi
77
=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-11-22 13:59:30 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_main.py 2015-11-28 20:44:31 +0000
@@ -238,30 +238,24 @@
238238
239 def test_square(self):239 def test_square(self):
240 self.app.main_view.insert('4')240 self.app.main_view.insert('4')
241 self.app.main_view.show_scientific_keyboard()
242 self.app.main_view.press('square')241 self.app.main_view.press('square')
243 self.app.main_view.hide_scientific_keyboard()
244 self.app.main_view.insert('=')242 self.app.main_view.insert('=')
245243
246 self._assert_result_is(u'16')244 self._assert_result_is(u'16')
247 self._assert_history_contains(u'4^2=16')245 self._assert_history_contains(u'4^2=16')
248246
249 def test_adding_square_to_empty_formula(self):247 def test_adding_square_to_empty_formula(self):
250 self.app.main_view.show_scientific_keyboard()
251 self.app.main_view.press('square')248 self.app.main_view.press('square')
252 self._assert_result_is(u'')249 self._assert_result_is(u'')
253250
254 def test_adding_square_after_operator(self):251 def test_adding_square_after_operator(self):
255 self.app.main_view.insert('6/')252 self.app.main_view.insert('6/')
256 self.app.main_view.show_scientific_keyboard()
257 self.app.main_view.press('square')253 self.app.main_view.press('square')
258 self._assert_result_is(u'6÷')254 self._assert_result_is(u'6÷')
259255
260 def test_cube(self):256 def test_cube(self):
261 self.app.main_view.insert('3')257 self.app.main_view.insert('3')
262 self.app.main_view.show_scientific_keyboard()
263 self.app.main_view.press('cube')258 self.app.main_view.press('cube')
264 self.app.main_view.hide_scientific_keyboard()
265 self.app.main_view.insert('=')259 self.app.main_view.insert('=')
266260
267 self._assert_result_is(u'27')261 self._assert_result_is(u'27')
@@ -269,28 +263,22 @@
269263
270 def test_power(self):264 def test_power(self):
271 self.app.main_view.insert('2')265 self.app.main_view.insert('2')
272 self.app.main_view.show_scientific_keyboard()
273 self.app.main_view.press('power')266 self.app.main_view.press('power')
274 self.app.main_view.hide_scientific_keyboard()
275 self.app.main_view.insert('-4=')267 self.app.main_view.insert('-4=')
276268
277 self._assert_result_is(u'0.0625')269 self._assert_result_is(u'0.0625')
278 self._assert_history_contains(u'2^−4=0.0625')270 self._assert_history_contains(u'2^−4=0.0625')
279271
280 def test_loge(self):272 def test_loge(self):
281 self.app.main_view.show_scientific_keyboard()
282 self.app.main_view.press('log')273 self.app.main_view.press('log')
283 self.app.main_view.press('e')274 self.app.main_view.press('e')
284 self.app.main_view.hide_scientific_keyboard()
285 self.app.main_view.insert('=')275 self.app.main_view.insert('=')
286276
287 self._assert_result_is(u'1')277 self._assert_result_is(u'1')
288278
289 def test_factorial(self):279 def test_factorial(self):
290 self.app.main_view.insert('4')280 self.app.main_view.insert('4')
291 self.app.main_view.show_scientific_keyboard()
292 self.app.main_view.press('!')281 self.app.main_view.press('!')
293 self.app.main_view.hide_scientific_keyboard()
294 self.app.main_view.insert('=')282 self.app.main_view.insert('=')
295283
296 self._assert_result_is(u'24')284 self._assert_result_is(u'24')
@@ -299,9 +287,7 @@
299 def test_factorial_with_brackets(self):287 def test_factorial_with_brackets(self):
300 self.app.main_view.press_universal_bracket()288 self.app.main_view.press_universal_bracket()
301 self.app.main_view.insert('3')289 self.app.main_view.insert('3')
302 self.app.main_view.show_scientific_keyboard()
303 self.app.main_view.press('!')290 self.app.main_view.press('!')
304 self.app.main_view.hide_scientific_keyboard()
305 self.app.main_view.insert('*2')291 self.app.main_view.insert('*2')
306 self.app.main_view.press_universal_bracket()292 self.app.main_view.press_universal_bracket()
307 self.app.main_view.insert('=')293 self.app.main_view.insert('=')
@@ -310,18 +296,14 @@
310 self._assert_history_contains(u'(3!×2)=12')296 self._assert_history_contains(u'(3!×2)=12')
311297
312 def test_sin(self):298 def test_sin(self):
313 self.app.main_view.show_scientific_keyboard()
314 self.app.main_view.press('sin')299 self.app.main_view.press('sin')
315 self.app.main_view.hide_scientific_keyboard()
316 self.app.main_view.insert('0=')300 self.app.main_view.insert('0=')
317301
318 self._assert_result_is(u'0')302 self._assert_result_is(u'0')
319 self._assert_history_contains(u'sin(0)=0')303 self._assert_history_contains(u'sin(0)=0')
320304
321 def test_cos(self):305 def test_cos(self):
322 self.app.main_view.show_scientific_keyboard()
323 self.app.main_view.press('cos')306 self.app.main_view.press('cos')
324 self.app.main_view.hide_scientific_keyboard()
325 self.app.main_view.insert('0')307 self.app.main_view.insert('0')
326 self.app.main_view.press_universal_bracket()308 self.app.main_view.press_universal_bracket()
327 self.app.main_view.insert('=')309 self.app.main_view.insert('=')
@@ -331,16 +313,12 @@
331313
332 def test_validation_complex_numbers(self):314 def test_validation_complex_numbers(self):
333 self.app.main_view.insert('66')315 self.app.main_view.insert('66')
334 self.app.main_view.show_scientific_keyboard()
335 self.app.main_view.press('i')316 self.app.main_view.press('i')
336 self.app.main_view.hide_scientific_keyboard()
337 self.app.main_view.insert('*')317 self.app.main_view.insert('*')
338 self.app.main_view.show_scientific_keyboard()
339 self.app.main_view.press('i')318 self.app.main_view.press('i')
340 self.app.main_view.press('i')319 self.app.main_view.press('i')
341 self.app.main_view.press('i')320 self.app.main_view.press('i')
342 self._assert_result_is(u'66i×i')321 self._assert_result_is(u'66i×i')
343 self.app.main_view.hide_scientific_keyboard()
344 self.app.main_view.insert('33=')322 self.app.main_view.insert('33=')
345 self._assert_result_is(u'−66')323 self._assert_result_is(u'−66')
346 self._assert_history_contains(u'66i×i=−66')324 self._assert_history_contains(u'66i×i=−66')
@@ -348,14 +326,10 @@
348 def test_formatting_long_complex_numbers(self):326 def test_formatting_long_complex_numbers(self):
349 self.app.main_view.press_universal_bracket()327 self.app.main_view.press_universal_bracket()
350 self.app.main_view.insert('3+4')328 self.app.main_view.insert('3+4')
351 self.app.main_view.show_scientific_keyboard()
352 self.app.main_view.press('i')329 self.app.main_view.press('i')
353 self.app.main_view.hide_scientific_keyboard()
354 self.app.main_view.press_universal_bracket()330 self.app.main_view.press_universal_bracket()
355 self._assert_result_is(u'(3+4i)')331 self._assert_result_is(u'(3+4i)')
356 self.app.main_view.show_scientific_keyboard()
357 self.app.main_view.press('square')332 self.app.main_view.press('square')
358 self.app.main_view.hide_scientific_keyboard()
359 self.app.main_view.insert('=')333 self.app.main_view.insert('=')
360 self._assert_result_is(u'−6.999999999999997+24i')334 self._assert_result_is(u'−6.999999999999997+24i')
361 self._assert_history_contains(u'(3+4i)^2=−6.999999999999997+24i')335 self._assert_history_contains(u'(3+4i)^2=−6.999999999999997+24i')

Subscribers

People subscribed via source and target branches