Merge lp:~renatofilho/mediaplayer-app/new-sdk-name into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Update runtime dependencies to account for the renaming of the UI toolkit package.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/186

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/mediaplayer-app/new-sdk-name]

63. By Renato Araujo Oliveira Filho on 2013-03-21

[autopilot] Make sure that the scene selector stops moving before click on scene

64. By Renato Araujo Oliveira Filho on 2013-03-21

Added 'qtmultimedia5-dev' into binary dependecy list because it contains the necessary plugin to play multimedia files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/239

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/241/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/271

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-03-18 18:14:37 +0000
+++ debian/control	2013-03-21 20:19:21 +0000
@@ -26,7 +26,8 @@
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-         qt-components-ubuntu,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         qtmultimedia5-dev,
          libhud-qt-qml,
          gstreamer0.10-ffmpeg,
          gstreamer0.10-plugins-base,

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-03-06 20:47:01 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-03-21 20:19:21 +0000
@@ -94,29 +94,26 @@
         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")
-        self.assertThat(selector.count, Eventually(GreaterThan(3)))
-
-        scene_2 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene2")
-        self.assertThat(scene_2.ready, Eventually(Equals(True)))
-
+        self.assertThat(selector.count, Eventually(GreaterThan(3)))        
 
         """ Show scene selector """
         self.mouse.move_to_object(slider)
         self.mouse.click()
 
         """ 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)
-        scene_0 = self.main_window.get_object("SceneFrame", "SceneSelector.Scene0")
-        self.assertThat(scene_0.x, Eventually(GreaterThan(-1)))
-
+        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")
+        self.assertThat(scene_2.ready, Eventually(Equals(True)))
         self.mouse.move_to_object(scene_2)
         self.mouse.click()
         self.assertThat(selector.currentIndex, Eventually(Equals(2)))
-
         self.assertProperty(time_line, value=1.113)
 
     def test_time_display_behavior(self):