Merge lp:~javier.collado/mediaplayer-app/test-static-analysis into lp:mediaplayer-app

[Javier Collado]

Fixed static analysis problems in autopilot test cases source code.

This branch fixes some static analysis problems found in the autopilot test
cases source code.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/71/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/314/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/285

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/71/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator? YES

Did CI run pass? YES

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut? YES

review: Approve

Unmerged revisions

112. By Javier Collado on 2013-06-21

Fixed type (buttom -> button)

111. By Javier Collado on 2013-06-21

Fixed strings

Moved docstrings to the right location and marked comments as such

110. By Javier Collado on 2013-06-21

Fixed long lines

109. By Javier Collado on 2013-06-21

Removed unused imports

=== modified file 'tests/autopilot/mediaplayer_app/tests/__init__.py'
--- tests/autopilot/mediaplayer_app/tests/__init__.py	2013-05-27 11:23:52 +0000
+++ tests/autopilot/mediaplayer_app/tests/__init__.py	2013-06-21 15:56:31 +0000
@@ -7,7 +7,6 @@
 
 """mediaplayer-app autopilot tests."""
 
-from os import remove
 import os.path
 import os
 
@@ -68,7 +67,8 @@
                 "mediaplayer-app",
                 "file:///usr/share/mediaplayer-app/videos/" + movie_file,
                 "--fullscreen",
-                "--desktop_file_hint=/usr/share/applications/mediaplayer-app.desktop",
+                ("--desktop_file_hint="
+                 "/usr/share/applications/mediaplayer-app.desktop"),
                 app_type='qt')
 
     @property

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player.py'
--- tests/autopilot/mediaplayer_app/tests/test_player.py	2013-05-27 11:23:52 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player.py	2013-06-21 15:56:31 +0000
@@ -14,39 +14,34 @@
 
 from mediaplayer_app.tests import MediaplayerAppTestCase
 
-import unittest
-import time
-import os
-from os import path
-
 
 class TestPlayer(MediaplayerAppTestCase):
     """Tests the main media player features"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestPlayer, self).setUp()
         self.launch_app()
+        # This is needed to wait for the application to start.
+        # In the testfarm, the application may take some time to show up.
         self.assertThat(
             self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestPlayer, self).tearDown()
 
-    """ Test if the toolbar appears with mouse click over the video area """
     def test_controls_visibility(self):
+        """Test if the toolbar appears with mouse click over the video area."""
         controls = self.main_window.get_object("Controls", "controls")
 
-        """ The toolbar is invisible by default """
+        # The toolbar is invisible by default
         self.assertProperty(controls, visible=False)
 
-        """ Toolbar must apper when clicked in the video area """
+        # Toolbar must apper when clicked in the video area
         video_area = self.main_window.get_object("VideoPlayer", "player")
         self.pointing_device.move_to_object(video_area)
         self.pointing_device.click()
         self.assertProperty(controls, visible=True)
 
-        """ Toolbar must disappear when clicked in the video area again """
+        # Toolbar must disappear when clicked in the video area again
         self.pointing_device.click()
         self.assertProperty(controls, visible=True)

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-06-07 13:51:58 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-06-21 15:56:31 +0000
@@ -22,11 +22,11 @@
 class TestPlayerWithVideo(MediaplayerAppTestCase):
     """Tests the main media player features while playing a video """
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestPlayerWithVideo, self).setUp()
         self.launch_app("small.mp4")
+        # This is needed to wait for the application to start.
+        # In the testfarm, the application may take some time to show up.
         self.assertThat(
             self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
@@ -41,88 +41,97 @@
         self.assertThat(toolbar.ready, Eventually(Equals(True)))
 
     def pause_video(self):
-        playback_buttom = self.main_window.get_object("IconButton", "Controls.PlayBackButton")
-        self.pointing_device.move_to_object(playback_buttom)
+        playback_button = self.main_window.get_object(
+            "IconButton", "Controls.PlayBackButton")
+        self.pointing_device.move_to_object(playback_button)
         self.pointing_device.click()
 
-    def test_playback_buttom_states(self):
+    def test_playback_button_states(self):
         self.show_controls()
 
-        playback_buttom = self.main_window.get_object("IconButton", "Controls.PlayBackButton")
+        playback_button = self.main_window.get_object(
+            "IconButton", "Controls.PlayBackButton")
         player = self.main_window.get_object("VideoPlayer", "player")
 
-        """ Default state after load the video is playing and with pause
-        icon.
-        """
+        # Default state after load the video is playing and with pause icon.
         self.assertProperty(player, playing=True, paused=False)
-        self.assertProperty(playback_buttom, icon="pause")
+        self.assertProperty(playback_button, icon="pause")
 
-        self.pointing_device.move_to_object(playback_buttom)
+        self.pointing_device.move_to_object(playback_button)
         self.pointing_device.click()
 
-        """ First click must pause the video, change playing state and show
-        play icon. """
+        # First click must pause the video, change playing state
+        # and show play icon.
         self.assertProperty(player, playing=False, paused=True)
-        self.assertProperty(playback_buttom, icon="play")
+        self.assertProperty(playback_button, icon="play")
 
         self.pointing_device.click()
 
-        """ Second click should change the state to playing again """
+        # Second click should change the state to playing again
         self.assertProperty(player, playing=True, paused=False)
-        self.assertProperty(playback_buttom, icon="pause")
+        self.assertProperty(playback_button, icon="pause")
 
-    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus',
+            'Screen width not enough for seekbar')
     def test_scene_selector_visibility(self):
         self.show_controls()
         self.pause_video()
 
-        scene_selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
+        scene_selector = self.main_window.get_object(
+            "SceneSelector", "Controls.SceneSelector")
         slider = self.main_window.get_object("Slider", "TimeLine.Slider")
 
-        """ Default state is hide """
+        # Default state is hide
         self.assertProperty(scene_selector, visible=False)
 
-        """ Scene selector must apper when clicking int the slider handler """
+        # Scene selector must apper when clicking int the slider handler
         self.pointing_device.move_to_object(slider)
         self.pointing_device.click()
         self.assertProperty(scene_selector, visible=True)
 
-        """ click again must dismiss the scene selector """
+        # click again must dismiss the scene selector
         self.pointing_device.click()
         self.assertProperty(scene_selector, visible=False)
 
-    @skip("fails on touch and is not reliable on different screen resolutions. bug 1183245")
+    @skip("fails on touch and is not reliable on different screen resolutions."
+          " bug 1183245")
     def test_scene_selector_operation(self):
         self.show_controls()
         self.pause_video()
 
         slider = self.main_window.get_object("Slider", "TimeLine.Slider")
         time_line = self.main_window.get_object("TimeLine", "TimeLine")
-        selector = self.main_window.get_object("SceneSelector", "Controls.SceneSelector")
+        selector = self.main_window.get_object(
+            "SceneSelector", "Controls.SceneSelector")
         self.assertThat(selector.count, Eventually(GreaterThan(3)))
 
-        """ Show scene selector """
+        # Show scene selector
         self.pointing_device.move_to_object(slider)
         self.pointing_device.click()
 
-        """ Make sure that the scenes are in correct place """
-        scene_0 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene0")
+        # Make sure that the scenes are in correct place
+        scene_0 = self.main_window.get_object(
+            "SceneFrame", "SceneSelector.Scene0")
         selectorRect = selector.globalRect
         self.pointing_device.drag(
-            selectorRect[0], selectorRect[1] + selectorRect[3] / 2,
-            selectorRect[0] + selectorRect[2], selectorRect[1] + selectorRect[3] / 2)
+            selectorRect[0],
+            selectorRect[1] + selectorRect[3] / 2,
+            selectorRect[0] + selectorRect[2],
+            selectorRect[1] + selectorRect[3] / 2)
         self.assertThat(selector.moving, Eventually(Equals(False)))
         self.assertThat(scene_0.x, Eventually(Equals(0)))
 
-        """ Click in the second scene """
-        scene_2 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene2")
+        # Click in the second scene
+        scene_2 = self.main_window.get_object(
+            "SceneFrame", "SceneSelector.Scene2")
         self.assertThat(scene_2.ready, Eventually(Equals(True)))
         self.pointing_device.move_to_object(scene_2)
         self.pointing_device.click()
         self.assertThat(selector.currentIndex, Eventually(Equals(2)))
         self.assertProperty(time_line, value=1.107)
 
-    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus',
+            'Screen width not enough for seekbar')
     def test_time_display_behavior(self):
         self.show_controls()
         self.pause_video()
@@ -130,41 +139,40 @@
         time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
         time_label = self.main_window.get_object("Label", "TimeLine.TimeLabel")
 
-        """ Seek to the midle of the movie """
+        # Seek to the midle of the movie
         self.pointing_device.move_to_object(time_line)
         self.pointing_device.click()
 
-        """ Time label must show the current video time
-            - Depends on the resolution the current time can be different due
-              the slider size, because of that we avoid compare the secs
-        """
+        # Time label must show the current video time
+        # - Depends on the resolution the current time can be different due
+        #   the slider size, because of that we avoid compare the secs
         self.assertEqual(time_label.text[0:7], "00:00:0")
 
-        """ Click in the label to change the state """
+        # Click in the label to change the state
         self.pointing_device.move_to_object(time_label)
         self.pointing_device.click()
 
-        """ After the click the label must show the remaning time
-            - Depends on the resolution the current time can be different due
-              the slider size, because of that we avoid compare the secs
-        """
+        # After the click the label must show the remaning time
+        # - Depends on the resolution the current time can be different due
+        #   the slider size, because of that we avoid compare the secs
         self.assertEqual(time_label.text[0:9], "- 00:00:0")
 
-    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
+    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus',
+            'Screen width not enough for seekbar')
     def test_show_controls_at_end(self):
         self.show_controls()
         time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
 
-        """ Seek to the midle of the video  """
+        # Seek to the midle of the video
         self.pointing_device.move_to_object(time_line)
         self.pointing_device.click()
 
-        """ hide controls """
+        # hide controls
         video_area = self.main_window.get_object("VideoPlayer", "player")
         self.pointing_device.move_to_object(video_area)
         self.pointing_device.click()
 
-        """ wait for video ends and control appears"""
+        # wait for video ends and control appears
         controls = self.main_window.get_object("Controls", "controls")
         self.assertProperty(controls, visible=False)
         self.assertThat(controls.visible, Eventually(Equals(True)))