Merge lp:~nskaggs/dropping-letters/fix-pep8 into lp:dropping-letters

[Nicholas Skaggs]

Cleanup and fix pep8 issues in tests

Cleanup and fix pep8 issues in tests

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
--- tests/autopilot/dropping_letters_app/tests/__init__.py	2013-09-26 18:03:39 +0000
+++ tests/autopilot/dropping_letters_app/tests/__init__.py	2013-09-27 16:59:32 +0000
@@ -38,13 +38,14 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../dropping-letters.qml"
+    installed_location = "/usr/share/dropping-letters/dropping-letters.qml"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(DroppingLettersTestCase, self).setUp()
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        elif os.path.exists('/usr/share/dropping-letters/dropping-letters.qml'):
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
         else:
             self.launch_test_click()
@@ -59,14 +60,16 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/dropping-letters/dropping-letters.qml",
+            self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "dropping-letters.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_click(self):
-        self.app = self.launch_click_package('com.ubuntu.dropping-letters', emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+        self.app = self.launch_click_package(
+            "com.ubuntu.dropping-letters",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     @property
     def main_view(self):

=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2013-09-26 19:02:31 +0000
+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2013-09-27 16:59:32 +0000
@@ -45,14 +45,16 @@
         self.pointing_device.click_object(helpbutton)
 
         #check and ensure help popover appears
-        self.assertThat(self.main_view.get_help_popover, Eventually(NotEquals(None)))
+        self.assertThat(self.main_view.get_help_popover,
+                        Eventually(NotEquals(None)))
         helpPopover = self.main_view.get_help_popover()
         properties = helpPopover.get_properties()
         self.assertTrue(properties["visible"])
 
         #check and ensure help popover disappears
         self.pointing_device.click_object(helpbutton)
-        self.assertThat(self.main_view.get_help_popover, Eventually(Equals(None)))
+        self.assertThat(self.main_view.get_help_popover,
+                        Eventually(Equals(None)))
 
     def test_start_new_game(self):
         toolbar = self.main_view.open_toolbar()
@@ -69,18 +71,20 @@
         toolbar = self.main_view.close_toolbar()
 
         #check for letters falling
-        #select first 2 letters; wait for 3 letters to appear so first 2 are settled for clicking
+        #select first 2 letters; wait for 3 letters to appear
+        #so first 2 are settled for clicking
         tiles = self.main_view.get_letter_tiles()
         while len(tiles) < 3:
             tiles = self.main_view.get_letter_tiles()
 
         #click the accumlated letters
         #check and make sure they get selected
-        #add tries as a control to avoid infinite loop and provide better failure feedback
+        #add tries as a control to avoid infinite loop
+        #and provide better failure feedback
         tries = 0
         self.pointing_device.click_object(tiles[0])
         tileProperties = tiles[0].get_properties()
-        while (tileProperties["selected"] == False and tries < 10):
+        while (not tileProperties["selected"] and tries < 10):
             sleep(1)
             tries += 1
             self.pointing_device.click_object(tiles[0])
@@ -91,7 +95,7 @@
         tries = 0
         self.pointing_device.click_object(tiles[1])
         tileProperties = tiles[1].get_properties()
-        while (tileProperties["selected"] == False and tries < 10):
+        while (not tileProperties["selected"] and tries < 10):
             sleep(1)
             tries += 1
             self.pointing_device.click_object(tiles[1])
@@ -108,11 +112,12 @@
         validWord = word.isValid
         self.pointing_device.click_object(word)
 
-        #depending on if the property isValid is true or not, score should increase or stay the same after completion
-        #we don't need to get fancy, since the start value is 0; check for zero or non-zero score
+        #depending on if the property isValid is true or not,
+        #score should increase or stay the same after completion
+        #we don't need to get fancy, since the start value is 0;
+        #check for zero or non-zero score
         main_score_label = self.main_view.get_main_score_label()
         if validWord:
             self.assertNotEquals(main_score_label.text, '0')
         else:
             self.assertEquals(main_score_label.text, '0')
-