Merge lp:~nik-jov-92/ubuntu-calculator-app/multiple_equals into lp:~acerisara/ubuntu-calculator-app/operation-after-clear

[Nikola Jovanovic]

Implemented test for bug #1400890. Test named "test_multiple_equals".

[Bartosz Kosiorek (gang65)]

Thanks Nikola. Great job!

First please take a look at our README file (into "Clean/Beautiful Code" section).
It will be great if you will follow these rules.
Please take a look at my inline comments.

Please also modify this Merge Request, to merge into:
lp:ubuntu-calculator-app/reboot
https://code.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/reboot

review: Needs Fixing

[Andrea Cerisara (acerisara)]

In addition to what Bartosz said (even though in this case I would prefer to check explicitly for the size), please merge trunk and use _assert_result_is / _assert_history_contains to check the results of a calculation.

[Nikola Jovanovic (nik-jov-92)]

Mr. Andrea,

I'm sorry for late responding. I will get right on it, just one little question is there a way to set a breakpoint like in Visual Studio so I can review it by lines of code and is there a way to print something in the terminal as autopilot goes? Thank you for your time and review I will get right on it :-)

Best Regards,
Nikola Jovanovic
<email address hidden>

> To: <email address hidden>
> From: <email address hidden>
> Subject: Re: [Merge] lp:~nik-jov-92/ubuntu-calculator-app/multiple_equals into lp:~acerisara/ubuntu-calculator-app/operation-after-clear
> Date: Fri, 9 Jan 2015 21:40:11 +0000
>
> In addition to what Bartosz said (even though in this case I would prefer to check explicitly for the size), please merge trunk and use _assert_result_is / _assert_history_contains to check the results of a calculation.
> --
> https://code.launchpad.net/~nik-jov-92/ubuntu-calculator-app/multiple_equals/+merge/245826
> You are the owner of lp:~nik-jov-92/ubuntu-calculator-app/multiple_equals.

[Andrea Cerisara (acerisara)]

Ciao Nikola,

to print something in the terminal, print(obj). To debug you can use pdb, take a look at https://docs.python.org/3/library/pdb.html. Let me know how it goes :)

[Niklas Wenzel (nikwen)]

The bug has been fixed now, so I think we can close this MP.

[Bartosz Kosiorek (gang65)]

review: Disapprove

Unmerged revisions

49. By Nikola Jovanovic on 2015-01-08

fix testcase for multiple equals

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-12-27 10:06:06 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-08 10:14:59 +0000
@@ -61,12 +61,23 @@
         return calc.wait_select_single('QQuickText',
                                        objectName='result').text.strip()
 
+    def size(self):
+        _retValue = 0
+
+        history = self.app.select_many('QQuickRectangle', objectName='mainItem')
+
+        if (history > 0):
+            _retValue = 1
+
+        return _retValue
+
 
 class MainView(ubuntuuitoolkit.MainView):
     """Calculator MainView Autopilot emulator."""
 
-    BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton',
-               '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton'}
+    BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton', '1': 'oneButton', '2': 'twoButton', 
+               '3': 'threeButton', '4': 'fourButton', '5': 'fiveButton', '6': 'sixButton', 
+               '7': 'sevenButton', '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton'}
 
     def __init__(self, *args):
         super(MainView, self).__init__(*args)
@@ -94,3 +105,15 @@
     def get_result(self):
         return self.wait_select_single('TextField',
                                        objectName='textInputField').displayText
+
+
+
+    """def check_for_equality(self, expression):
+        isEqual = False
+
+        history = self.get_history()
+        if history == expression:
+            isEqual = True
+
+        return isEqual"""
+

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2014-12-27 10:06:06 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-01-08 10:14:59 +0000
@@ -27,3 +27,18 @@
                         Eventually(Equals('81')))
 
         self.assertTrue(self.app.main_view.get_history().contains('9×9=81'))
+
+
+    def test_multiple_equals(self):
+        self.app.main_view.insert('2*8=')
+        self.assertThat(self.app.main_view.get_result, Eventually(Equals('16')))
+
+        self.assertEqual(1, self.app.main_view.get_history().size())
+        self.assertTrue(self.app.main_view.get_history().contains('2x8=16'))
+
+        self.app.main_view.press('=')
+        self.app.main_view.press('=')
+        self.app.main_view.press('=')
+
+        self.assertEqual(1, self.app.main_view.get_history().size())
+        self.assertTrue(self.app.main_view.get_history().contains('2x8=16'))