Merge lp:~carla-sella/music-app/queue-track-test into lp:music-app/trusty

[Carla Sella]

Autopilot test for music-app

Added test_add_song_to_queue_from_albums_sheet.
Fixed Bug #1253452.

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

PASSED: Continuous integration, rev:263
http://91.189.93.70:8080/job/music-app-ci/343/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/326
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/343
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/345
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/64

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/343/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Consider also doing the following (but I don't think it's absolutely required to do so):
1. Assert that the song added to the list is not playing.
2. Assert that the song's metadata matches the item added to the Now Playing view (the queue).

review: Approve

[Carla Sella (carla-sella)]

@Victor: I found in the queue, using autopilot vis, the item where the song has been added, but cannot distinguish it from the others, do not find a count ID or something that distinguishes that song queued from the others.
For instance if I queue twice the same song, cannot find the last one queued as they both have the same title and artist.
Can you suggest something for this ?
Thanks.

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

PASSED: Continuous integration, rev:264
http://91.189.93.70:8080/job/music-app-ci/344/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/330
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/344
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/346
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/65

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/344/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Can you get the last item in the ListView that you use to determine the
queue count?
On Dec 3, 2013 3:03 PM, "Carla Sella" <email address hidden> wrote:

> @Victor: I found in the queue, using autopilot vis, the item where the
> song has been added, but cannot distinguish it from the others, do not find
> a count ID or something that distinguishes that song queued from the others.
> For instance if I queue twice the same song, cannot find the last one
> queued as they both have the same title and artist.
> Can you suggest something for this ?
> Thanks.
> --
>
> https://code.launchpad.net/~carla-sella/music-app/queue-track-test/+merge/197443
> You are reviewing the proposed merge of
> lp:~carla-sella/music-app/queue-track-test into lp:music-app.
>

[Carla Sella (carla-sella)]

Yes.
What I can get in the ListView is the count property, but then I have, for instance, three objects named "Standard" containing the information about the queued items (track title, track author ...) but there is no way to determine witch of the three objects is the last queued a part the fact that it is in the last position, but I need a property to verify it's the last one.

[Victor Thompson (vthompson)]

I just put out a merge proposal that makes the initial state of the queue empty [1]. If that get's approved by the other developers on the music-app team, then you're problem should be solved as there should only be one item from a fresh start.

I might look a bit more later this evening, however, to see if I can help with an immediate solution.

[1] https://code.launchpad.net/~vthompson/music-app/start-with-empty-queue/+merge/197610

[Carla Sella (carla-sella)]

I tried to verify metadata matches the item added to the queue taking for granted that there is no other same track in the queue.
Hope this is ok.
So bug #1253452 should be fixed now.

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

PASSED: Continuous integration, rev:265
http://91.189.93.70:8080/job/music-app-ci/348/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/341
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/348
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/350
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/348/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Added verification looks good.

review: Approve

[Victor Thompson (vthompson)]

I just wanted to add that this perhaps isn't the best verification after looking it over a second time. It's possible that in the future the metadata being checked for against the first item being added to the queue won't be initialized until we start playing a song (this case seems ideal to me.). We'll cross that bridge when we get there, however. :)

=== modified file 'MusicAlbums.qml'
--- MusicAlbums.qml	2013-12-01 08:52:59 +0000
+++ MusicAlbums.qml	2013-12-04 21:27:24 +0000
@@ -241,6 +241,7 @@
 
                     ListItem.Standard {
                         id: track
+                        objectName: "albumsheet-track"
                         iconFrame: false
                         progression: false
                         height: styleMusic.albums.itemHeight
@@ -267,6 +268,7 @@
 
                         Label {
                             id: trackTitle
+                            objectName: "albumsheet-tracktitle"
                             wrapMode: Text.NoWrap
                             maximumLineCount: 1
                             fontSize: "medium"
@@ -284,6 +286,7 @@
 
                         Image {
                             id: expandItem
+                            objectName: "albumsheet-expanditem"
                             anchors.right: parent.right
                             anchors.rightMargin: units.gu(2)
                             source: expandable.visible ? "images/dropdown-menu-up.svg" : "images/dropdown-menu.svg"
@@ -410,6 +413,7 @@
                                 width: units.gu(15)
                                 Image {
                                     id: queueTrack
+                                    objectName: "albumsheet-queuetrack"
                                     anchors.top: parent.top
                                     anchors.topMargin: height/2
                                     source: "images/queue.png"

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2013-12-01 08:52:59 +0000
+++ MusicNowPlaying.qml	2013-12-04 21:27:24 +0000
@@ -104,6 +104,7 @@
 
     ListView {
         id: queuelist
+        objectName: "queuelist"
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
         anchors.topMargin: nowPlayingBackButton.height
@@ -561,6 +562,7 @@
                     }
                     Label {
                         id: nowPlayingArtist
+                        objectName: "nowplayingartist"
                         color: styleMusic.nowPlaying.labelSecondaryColor
                         elide: Text.ElideRight
                         height: units.gu(1)
@@ -572,6 +574,7 @@
                     }
                     Label {
                         id: nowPlayingTitle
+                        objectName: "nowplayingtitle"
                         color: styleMusic.common.white
                         elide: Text.ElideRight
                         height: units.gu(1)
@@ -583,6 +586,7 @@
                     }
                     Label {
                         id: nowPlayingAlbum
+                        objectName: "nowplayingalbum"
                         color: styleMusic.nowPlaying.labelSecondaryColor
                         elide: Text.ElideRight
                         height: units.gu(1)

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2013-11-26 21:42:53 +0000
+++ tests/autopilot/music_app/emulators.py	2013-12-04 21:27:24 +0000
@@ -105,3 +105,45 @@
         for item in closebuttons:
             if item.enabled:
                 return item
+
+    def get_album_sheet_listview_tracktitle(self, trackTitle):
+        tracktitles = self.select_many(
+            "Label", objectName="albumsheet-tracktitle")
+        for item in tracktitles:
+            if item.text == trackTitle:
+                return item
+
+    def get_album_sheet_listview_trackicon(self, trackTitle):
+        tracktitle = self.get_album_sheet_listview_tracktitle(trackTitle)
+        tracktitle_position = tracktitle.globalRect[1]
+        trackicons = self.select_many(
+            "QQuickImage", objectName="albumsheet-expanditem")
+        for item in trackicons:
+            if item.globalRect[1] == tracktitle_position:
+                return item
+
+    def get_album_sheet_queuetrack_image(self):
+        queuetracks = self.select_many_retry(
+            "QQuickImage", objectName="albumsheet-queuetrack")
+        for item in queuetracks:
+            if item.visible:
+                return item
+
+    def get_queue_track_count(self):
+        queuelist = self.select_single(
+            "QQuickListView", objectName="queuelist")
+        return queuelist.count
+
+    def get_queue_now_playing_artist(self, artistName):
+        playingartists = self.select_many(
+            "Label", objectName="nowplayingartist")
+        for item in playingartists:
+            if item.text == artistName:
+                return item
+
+    def get_queue_now_playing_title(self, trackTitle):
+        playingtitles = self.select_many(
+            "Label", objectName="nowplayingtitle")
+        for item in playingtitles:
+            if item.text == trackTitle:
+                return item

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2013-11-27 21:13:57 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2013-12-04 21:27:24 +0000
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, Is, Not, LessThan
+from testtools.matchers import Equals, Is, Not, LessThan, NotEquals
 
 from music_app.tests import MusicTestCase
 
@@ -219,3 +219,53 @@
         closebutton = self.main_view.get_album_sheet_close_button()
         self.pointing_device.click_object(closebutton)
         self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
+
+    def test_add_song_to_queue_from_albums_sheet(self):
+
+        trackTitle = "Foss Yeaaaah! (Radio Edit)"
+        artistName = "Benjamin Kerensa"
+
+        # get number of tracks in queue before queuing a track
+        initialtracksCount = self.main_view.get_queue_track_count()
+
+        # switch to albums tab
+        self.main_view.switch_to_tab("albumstab")
+
+        #select album
+        albumartist = self.main_view.get_albums_albumartist(artistName)
+        self.pointing_device.click_object(albumartist)
+
+        #get album sheet album artist
+        sheet_albumartist = self.main_view.get_album_sheet_artist()
+        self.assertThat(sheet_albumartist.text, Eventually(Equals(artistName)))
+
+        #get track item to add to queue
+        trackicon = self.main_view.get_album_sheet_listview_trackicon(
+            trackTitle)
+        self.pointing_device.click_object(trackicon)
+
+        #click on Add to queue
+        queueTrackImage = self.main_view.get_album_sheet_queuetrack_image()
+        self.pointing_device.click_object(queueTrackImage)
+
+        # verify track queue has added one to initial value
+        endtracksCount = self.main_view.get_queue_track_count()
+        self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
+
+        #Assert that the song added to the list is not playing
+        self.assertThat(self.main_view.currentIndex,
+                        Eventually(NotEquals(endtracksCount)))
+        self.assertThat(self.main_view.isPlaying, Eventually(Equals(False)))
+
+        #verity song's metadata matches the item added to the Now Playing view
+        queueArtistName = self.main_view.get_queue_now_playing_artist(
+            artistName)
+        self.assertThat(str(queueArtistName.text), Equals(artistName))
+        queueTrackTitle = self.main_view.get_queue_now_playing_title(
+            trackTitle)
+        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
+
+        # click on close button to close album sheet
+        closebutton = self.main_view.get_album_sheet_close_button()
+        self.pointing_device.click_object(closebutton)
+        self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))