Merge lp:~om26er/ubuntu-calculator-app/fix_pep8_and_more into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Omer Akram]

fixing pep8 complaints of the autopilot code

fixing pep8 complaints of the autopilot code, also fixes the way order in which we get variables from globalRect, they are in the form of x,y,w,h and we were using it as x,y, h, w

[Riccardo Padovani (rpadovani)]

Good, thanks :)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py	2013-08-02 02:51:30 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators/simple_page.py	2013-08-02 13:51:28 +0000
@@ -18,13 +18,15 @@
         return self.app.select_single('CalcLabel', isLast=True)
 
     def get_calc_label(self, numbers):
-    	return self.app.select_single('CalcLabel', numbers=numbers)
+        return self.app.select_single('CalcLabel', numbers=numbers)
 
     def get_screen(self):
         return self.app.select_many("Screen")[0]
 
     def get_confirm_delete_button(self):
-        return self.app.select_single("Button", objectName="calculationDelete", visible=True)
+        return self.app.select_single(
+            "Button", objectName="calculationDelete", visible=True)
 
     def get_main_screen_qqlv(self):
-        return self.app.select_single("SimplePage").select_single("QQuickListView")
+        page = self.app.select_single("SimplePage")
+        return page.select_single("QQuickListView")

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-02 02:51:30 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-02 13:51:28 +0000
@@ -80,10 +80,10 @@
     def _delete_last_calculation(self):
         screen = self.simple_page.get_screen()
         quick_list_view = self.simple_page.get_main_screen_qqlv()
-        
+
         x, y, w, h = screen.globalRect
         tx = x + (w - w / 8)
-        ty = y + (h / 2)        
+        ty = y + (h / 2)
         self.pointing_device.drag(tx, ty, tx / 8, ty)
         self.pointing_device.drag(tx, ty, tx, ty + h)
 
@@ -105,18 +105,19 @@
         # See #1188292, there is a bug in SDK that prevents to use terminate
         #self.simple_page.app.process.terminate()
         #self.simple_page.app.process.wait()
-    
+
         screen = self.simple_page.get_screen()
-        x, y, h, w = screen.globalRect
+        x, y, w, h = screen.globalRect
 
-        self.pointing_device.move(x + (h / 25), y + w / 2.7)
+        self.pointing_device.move(x + (w / 25), y + h / 2.7)
         self.pointing_device.click()
-        
+
         self.simple_page.app.process.wait()
 
         local_location = "../../ubuntu-calculator-app.qml"
 
-        # Yes, I know, it's a duplication of CalculatorTestCase().setUp(), but I didn't find a better way to implement it
+        # Yes, I know, it's a duplication of CalculatorTestCase().setUp(),
+        # but I didn't find a better way to implement it
         if os.path.exists(local_location):
             self.app = self.launch_test_application(
                 "qmlscene",
@@ -131,7 +132,9 @@
                 app_type='qt')
 
         # Check if windows has been launch
-        self.assertThat(self.simple_page.app.select_single("QQuickView").visible, Eventually(Equals(True)))
+        self.assertThat(
+            self.simple_page.app.select_single("QQuickView").visible,
+            Eventually(Equals(True)))
 
     def test_equals_dont_change_numbers(self):
         """ Test that typing a number and pressing "=" won't change the number
@@ -164,11 +167,11 @@
         screen = self.simple_page.get_screen()
         self._click_buttons("9")
 
-        x, y, h, w = screen.globalRect
-        tx = x + (h / 2)
-        ty = y + (w / 2)
+        x, y, w, h = screen.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2)
 
-        self.pointing_device.drag(tx, ty + w, tx, ty - w)
+        self.pointing_device.drag(tx, ty + h, tx, ty - h)
 
         self._assert_result("")
 
@@ -235,9 +238,9 @@
     def test_divide_by_zero(self):
         self._calculate("4/0")
         result_box = self.simple_page.get_formula_label().numbers
-        
-        self.assertThat(lambda: type(result_box) is not IntType,
-            Eventually(Equals(True)))
+
+        self.assertThat(
+            lambda: type(result_box) is not IntType, Eventually(Equals(True)))
 
     def test_tear_off(self):
         """Test tear off adds calculation to history"""
@@ -247,7 +250,8 @@
         self._tear_off("9+5")
 
         # Check if has been saved
-        self.assertThat(lambda: num_calc_sections_old,
+        self.assertThat(
+            lambda: num_calc_sections_old,
             Eventually(NotEquals(quick_list_view.count)))
 
     def test_swipe_delete_calculation_right_left(self):
@@ -260,7 +264,8 @@
         # Delete the calculation
         self._delete_last_calculation()
         # Check if has been deleted
-        self.assertThat(lambda: num_calc_sections_old,
+        self.assertThat(
+            lambda: num_calc_sections_old,
             Eventually(Equals(quick_list_view.count)))
 
     def test_click_history(self):
@@ -275,10 +280,11 @@
         self._calculate("+5")
         self._assert_result("25")
 
-    @unittest.skip("We are doing things wrong on so many levels, we are trying \
-        to click the close button with magic numbers which we cannot rely on, also \
-        on touch devices there is no such thing as close button, skipping this \
-        test for now till we find a better solution")
+    @unittest.skip("We are doing things wrong on so many levels, we are \
+        trying to click the close button with magic numbers which we \
+        cannot rely on, also on touch devices there is no such thing as \
+        close button, skipping this test for now till we find a better \
+        solution. bug 1207593")
     def test_save_calculation_between_reload(self):
         # Do the calc
         self._tear_off("44-2")