@@ -8,6 +8,7 @@ import com.adamratzman.spotify.buildSpotifyApi
88import com.adamratzman.spotify.endpoints.client.SpotifyPlayablePositions
99import com.adamratzman.spotify.models.Playlist
1010import com.adamratzman.spotify.models.SimplePlaylist
11+ import com.adamratzman.spotify.models.toTrackUri
1112import com.adamratzman.spotify.runBlockingTest
1213import com.adamratzman.spotify.utils.Platform
1314import com.adamratzman.spotify.utils.currentApiPlatform
@@ -100,7 +101,7 @@ class ClientPlaylistApiTest {
100101
101102 /* val playlistSize = { api!!.playlists.getClientPlaylist(createdPlaylist!!.id)!!.tracks.total }
102103 val sizeBefore = playlistSize()
103- api!!.playlists.addTracksToClientPlaylist (createdPlaylist!!.id, tracks=*tracks.toTypedArray())
104+ api!!.playlists.addPlayablesToClientPlaylist (createdPlaylist!!.id, tracks=*tracks.toTypedArray())
104105 assertEquals(sizeBefore.plus(tracks.size), playlistSize())
105106 api!!.playlists.removeTracksFromClientPlaylist(createdPlaylist!!.id, tracks=*tracks.toTypedArray())
106107 assertEquals(sizeBefore, playlistSize())*/
@@ -122,10 +123,10 @@ class ClientPlaylistApiTest {
122123 collaborative = true , description = " description 2"
123124 )
124125
125- api!! .playlists.addTracksToClientPlaylist (
126+ api!! .playlists.addPlayablesToClientPlaylist (
126127 createdPlaylist!! .id,
127- " 3WDIhWoRWVcaHdRwMEHkkS" ,
128- " 7FjZU7XFs7P9jHI9Z0yRhK"
128+ " 3WDIhWoRWVcaHdRwMEHkkS" .toTrackUri() ,
129+ " 7FjZU7XFs7P9jHI9Z0yRhK" .toTrackUri()
129130 )
130131
131132 api!! .playlists.uploadClientPlaylistCover(
@@ -143,13 +144,13 @@ class ClientPlaylistApiTest {
143144
144145 assertTrue(updatedPlaylist.tracks.total == 2 && updatedPlaylist.images.isNotEmpty())
145146
146- api!! .playlists.reorderClientPlaylistTracks (updatedPlaylist.id, 1 , insertionPoint = 0 )
147+ api!! .playlists.reorderClientPlaylistPlayables (updatedPlaylist.id, 1 , insertionPoint = 0 )
147148
148149 updatedPlaylist = api!! .playlists.getClientPlaylist(createdPlaylist!! .id)!!
149150
150151 assertTrue(updatedPlaylist.toFullPlaylist()?.tracks?.items?.get(0 )?.track?.id == " 7FjZU7XFs7P9jHI9Z0yRhK" )
151152
152- api!! .playlists.removeAllClientPlaylistTracks (updatedPlaylist.id)
153+ api!! .playlists.removeAllClientPlaylistPlayables (updatedPlaylist.id)
153154
154155 updatedPlaylist = api!! .playlists.getClientPlaylist(createdPlaylist!! .id)!!
155156
@@ -161,71 +162,71 @@ class ClientPlaylistApiTest {
161162 }
162163
163164 @Test
164- fun testRemovePlaylistTracks () {
165+ fun testRemovePlaylistPlayables () {
165166 if (currentApiPlatform != Platform .NATIVE ) {
166167 runBlockingTest {
167168 if (! testPrereq()) return @runBlockingTest else api!!
168169
169- val trackIdOne = " 3WDIhWoRWVcaHdRwMEHkkS"
170- val trackIdTwo = " 7FjZU7XFs7P9jHI9Z0yRhK"
171- api!! .playlists.addTracksToClientPlaylist (
170+ val playableUriOne = " 3WDIhWoRWVcaHdRwMEHkkS" .toTrackUri()
171+ val playableUriTwo = " 7FjZU7XFs7P9jHI9Z0yRhK" .toTrackUri()
172+ api!! .playlists.addPlayablesToClientPlaylist (
172173 createdPlaylist!! .id,
173- trackIdOne ,
174- trackIdOne ,
175- trackIdTwo ,
176- trackIdTwo
174+ playableUriOne ,
175+ playableUriOne ,
176+ playableUriTwo ,
177+ playableUriTwo
177178 )
178179
179180 assertTrue(api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.size == 4 )
180181
181- api!! .playlists.removeTrackFromClientPlaylist (createdPlaylist!! .id, trackIdOne )
182+ api!! .playlists.removePlayableFromClientPlaylist (createdPlaylist!! .id, playableUriOne )
182183
183184 assertEquals(
184- listOf (trackIdTwo, trackIdTwo ),
185- api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.id })
185+ listOf (playableUriTwo, playableUriTwo ),
186+ api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.uri })
186187
187- api!! .playlists.addTrackToClientPlaylist (createdPlaylist!! .id, trackIdOne )
188+ api!! .playlists.addPlayableToClientPlaylist (createdPlaylist!! .id, playableUriOne )
188189
189- api!! .playlists.removeTrackFromClientPlaylist (createdPlaylist!! .id, trackIdTwo , SpotifyPlayablePositions (1 ))
190+ api!! .playlists.removePlayableFromClientPlaylist (createdPlaylist!! .id, playableUriTwo , SpotifyPlayablePositions (1 ))
190191
191192 assertEquals(
192- listOf (trackIdTwo, trackIdOne ),
193- api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.id })
193+ listOf (playableUriTwo, playableUriOne ),
194+ api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.uri })
194195
195- api!! .playlists.setClientPlaylistTracks (
196+ api!! .playlists.setClientPlaylistPlayables (
196197 createdPlaylist!! .id,
197- trackIdOne ,
198- trackIdOne ,
199- trackIdTwo ,
200- trackIdTwo
198+ playableUriOne ,
199+ playableUriOne ,
200+ playableUriTwo ,
201+ playableUriTwo
201202 )
202203
203- api!! .playlists.removeTracksFromClientPlaylist (createdPlaylist!! .id, trackIdOne, trackIdTwo )
204+ api!! .playlists.removePlayablesFromClientPlaylist (createdPlaylist!! .id, playableUriOne, playableUriTwo )
204205
205206 assertTrue(api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.isEmpty())
206207
207- api!! .playlists.setClientPlaylistTracks (
208+ api!! .playlists.setClientPlaylistPlayables (
208209 createdPlaylist!! .id,
209- trackIdTwo ,
210- trackIdOne ,
211- trackIdTwo ,
212- trackIdTwo ,
213- trackIdOne
210+ playableUriTwo ,
211+ playableUriOne ,
212+ playableUriTwo ,
213+ playableUriTwo ,
214+ playableUriOne
214215 )
215216
216- api!! .playlists.removeTracksFromClientPlaylist (
217- createdPlaylist!! .id, Pair (trackIdOne , SpotifyPlayablePositions (4 )),
218- Pair (trackIdTwo , SpotifyPlayablePositions (0 ))
217+ api!! .playlists.removePlayablesFromClientPlaylist (
218+ createdPlaylist!! .id, Pair (playableUriOne , SpotifyPlayablePositions (4 )),
219+ Pair (playableUriTwo , SpotifyPlayablePositions (0 ))
219220 )
220221
221222 assertEquals(
222- listOf (trackIdOne, trackIdTwo, trackIdTwo ),
223- api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.id })
223+ listOf (playableUriOne, playableUriTwo, playableUriTwo ),
224+ api!! .playlists.getPlaylistTracks(createdPlaylist!! .id).items.map { it.track?.uri })
224225
225226 assertFailsWithSuspend<SpotifyException .BadRequestException > {
226- api!! .playlists.removeTracksFromClientPlaylist (
227+ api!! .playlists.removePlayablesFromClientPlaylist (
227228 createdPlaylist!! .id,
228- Pair (trackIdOne , SpotifyPlayablePositions (3 ))
229+ Pair (playableUriOne , SpotifyPlayablePositions (3 ))
229230 )
230231 }
231232
0 commit comments