Merge lp:~karni/ubuntuone-music-java-library/playlist-methods into lp:ubuntuone-music-java-library

[Michał Karnicki]

Added playlist creation and updating methods.

=== modified file '.bzrignore'
--- .bzrignore	2012-06-05 15:16:38 +0000
+++ .bzrignore	2012-08-21 14:13:25 +0000
@@ -16,3 +16,4 @@
 libs/jmock-*.jar
 libs/jmock-junit4-*.jar
 libs/hamcrest-all-*.jar
+src/main/com/ubuntuone/api/music/MusicTest.java
 
=== modified file 'ant.properties'
--- ant.properties	2012-06-05 15:16:38 +0000
+++ ant.properties	2012-08-21 14:13:25 +0000
@@ -61,4 +61,4 @@
 
 # Only used by official ubuntuone-hackers team.
 
-project.version=0.1
+project.version=0.1.0
 
=== modified file 'build.xml'
--- build.xml	2012-08-21 14:13:25 +0000
+++ build.xml	2012-08-21 14:13:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project name="ubuntuone-files-java-library" basedir="." default="jar">
+<project name="ubuntuone-music-java-library" basedir="." default="jar">
 
 	<description>
 	*** UbuntuOne Music Java library ***
 
=== modified file 'src/main/com/ubuntuone/api/music/U1MusicAPI.java'
--- src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-08-21 14:13:25 +0000
+++ src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-08-21 14:13:25 +0000
@@ -53,6 +53,7 @@
 import com.ubuntuone.api.music.client.StreamingClient;
 import com.ubuntuone.api.music.json.U1AlbumJson;
 import com.ubuntuone.api.music.json.U1ArtistJson;
+import com.ubuntuone.api.music.json.U1CustomJson;
 import com.ubuntuone.api.music.json.U1PlaylistJson;
 import com.ubuntuone.api.music.json.U1PlaylistSongJson;
 import com.ubuntuone.api.music.json.U1SongJson;
@@ -196,6 +197,44 @@
 		}
 	}
 	
+	public void getAlbumsByArtist(String artistId, U1AlbumRequestListener callback) {
+		callback.onStart();
+		String path = resourceClient.getPath(ALBUMS, artistId);
+		HttpResponse response = null;
+		try {
+			response = resourceClient.request(HttpGet.METHOD_NAME, path);
+			final int statusCode = getStatusCode(response);
+			if (statusCode == HttpStatus.SC_OK) {
+				U1AlbumJson.fromJson(getContentInputStream(response), callback);
+			} else {
+				handleHttpResponse(response, "Could not get artist albums.", callback);
+			}
+		} catch (JsonParseException jpe) {
+			// Received corrupt JSON. At this stage, response != null
+			final String bzrRev = getHeaderValue(ResponseHeader.X_BZR_REVISION_NUMBER, response);
+			final String date = getHeaderValue(ResponseHeader.DATE, response);
+			
+			callback.onFailure(new Failure("Could not get artist albums. Corrupt JSON.",
+					jpe, 0, null, bzrRev, date));
+		}  catch (OutOfMemoryError e) {
+			callback.onFailure(new Failure("Out of memory!", e));
+			throw e; // We're not expected to recover from this.
+		} catch (SSLException sslException) {
+			callback.onFailure(new Failure("SSL connection problem. This may be intermittent issue, " +
+					"please try again later.", sslException));
+		} catch (IOException ioException) {
+			// Failed to read the response.
+			callback.onFailure(new Failure("Could not get artist albums (network error).", ioException));
+		} catch (URISyntaxException uriSyntaxException) {
+			// Failed due to invalid URL within the library code.
+			throw new IllegalStateException(uriSyntaxException);
+		} catch (AuthorizerException signingException) {
+			callback.onFailure(new Failure("Could not get artist albums (signing exception).", signingException));
+		} finally {
+			callback.onFinish();
+		}
+	}
+	
 	public void getSongs(U1SongRequestListener callback) {
 		callback.onStart();
 		String path = resourceClient.getPath(SONGS);
@@ -310,13 +349,29 @@
 		}
 	}
 	
-	public void createPlaylist(String name, ArrayList<U1Song> songList,
+	public void createPlaylist(String name,
+			ArrayList<U1Song> songs, U1PlaylistSongRequestListener callback) {
+		putPlaylist(null, name, songs, callback);
+	}
+	
+	public void updatePlaylist(String playlistId, String name,
+			ArrayList<U1Song> songs, U1PlaylistSongRequestListener callback) {
+		putPlaylist(playlistId, name, songs, callback);
+	}
+	
+	public void putPlaylist(String playlistId, String name, ArrayList<U1Song> songs,
 			U1PlaylistSongRequestListener callback) {
 		callback.onStart();
-		String path = resourceClient.getPath(PLAYLISTS);
+		String path;
+		if (playlistId != null) {
+			path = resourceClient.getPath(PLAYLISTS, playlistId);
+		} else {
+			path = resourceClient.getPath(PLAYLISTS);
+		}
 		HttpResponse response = null;
 		try {
-			response = resourceClient.request(HttpPost.METHOD_NAME, path);
+			String data = U1CustomJson.toSongIdListJson(name, songs);
+			response = resourceClient.request(HttpPost.METHOD_NAME, path, null, data);
 			final int statusCode = getStatusCode(response);
 			if (statusCode == HttpStatus.SC_OK) {
 				U1PlaylistSongJson.fromJson(getContentInputStream(response), callback);
 
=== modified file 'src/main/com/ubuntuone/api/music/client/ResourceClient.java'
--- src/main/com/ubuntuone/api/music/client/ResourceClient.java	2012-08-21 14:13:25 +0000
+++ src/main/com/ubuntuone/api/music/client/ResourceClient.java	2012-08-21 14:13:25 +0000
@@ -32,6 +32,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -95,7 +96,9 @@
 		request.addHeader(HttpHeaders.USER_AGENT, userAgent);
 		request.addHeader(HttpHeaders.CONNECTION, CONNECTION);
 		request.addHeader(HttpHeaders.ACCEPT, ACCEPT);
-		if (data != null && HttpPut.METHOD_NAME.equals(method)) {
+		if (data != null && HttpPost.METHOD_NAME.equals(method)) {
+			((HttpPost) request).setEntity(new StringEntity(data, UTF8));
+		} else if (data != null && HttpPut.METHOD_NAME.equals(method)) {
 			((HttpPut) request).setEntity(new StringEntity(data, UTF8));
 		}
 		
 
=== added file 'src/main/com/ubuntuone/api/music/json/U1CustomJson.java'
--- src/main/com/ubuntuone/api/music/json/U1CustomJson.java	1970-01-01 00:00:00 +0000
+++ src/main/com/ubuntuone/api/music/json/U1CustomJson.java	2012-08-21 14:13:25 +0000
@@ -0,0 +1,56 @@
+/*
+ * Ubuntu One Music Java library - communicate with Ubuntu One music API
+ * 
+ * Copyright 2012 Canonical Ltd.
+ *   
+ * This file is part of Ubuntu One Files Java library.
+ *  
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses 
+ */
+
+package com.ubuntuone.api.music.json;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonGenerator;
+
+import com.ubuntuone.api.music.model.U1Song;
+
+public class U1CustomJson
+{
+	public static String toSongIdListJson(String name, ArrayList<U1Song> songs)
+			throws IOException {
+		final JsonFactory factory = new JsonFactory();
+		final StringWriter writer = new StringWriter(128);
+		final JsonGenerator g = factory.createJsonGenerator(writer);
+		
+		g.writeStartObject();
+		g.writeStringField("name", name);
+		
+		g.writeArrayFieldStart("song_id_list"); {
+			for (U1Song song : songs) {
+				g.writeString(song.getId());
+			}
+		}
+		g.writeEndArray();
+		
+		g.writeEndObject();
+		g.close();
+		
+		return writer.toString();
+	}
+}
 
=== added file 'src/test/com/ubuntuone/api/music/CreatePlaylistTest.java'
--- src/test/com/ubuntuone/api/music/CreatePlaylistTest.java	1970-01-01 00:00:00 +0000
+++ src/test/com/ubuntuone/api/music/CreatePlaylistTest.java	2012-08-21 14:13:25 +0000
@@ -0,0 +1,213 @@
+/*
+ * Ubuntu One Music Java library - communicate with Ubuntu One music API
+ * 
+ * Copyright 2012 Canonical Ltd.
+ *   
+ * This file is part of Ubuntu One Files Java library.
+ *  
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses 
+ */
+
+package com.ubuntuone.api.music;
+
+import static com.ubuntuone.test.util.SameHttpRequestMatcher.sameRequest;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.Sequence;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ubuntuone.api.music.client.BaseClient;
+import com.ubuntuone.api.music.client.Failure;
+import com.ubuntuone.api.music.json.U1CustomJson;
+import com.ubuntuone.api.music.model.U1Meta;
+import com.ubuntuone.api.music.model.U1PlaylistSong;
+import com.ubuntuone.api.music.model.U1Song;
+import com.ubuntuone.api.music.util.RequestListener.U1PlaylistSongRequestListener;
+import com.ubuntuone.music.util.U1ResponseBuilder;
+import com.ubuntuone.music.util.U1SongBuilder;
+import com.ubuntuone.music.util.Util;
+import com.ubuntuone.test.util.DummyAuthorizer;
+
+@RunWith(JMock.class)
+public class CreatePlaylistTest
+{
+	private final Mockery context = new JUnit4Mockery();
+
+	private HttpResponse httpResponse;
+	
+	private HttpHost httpHost =
+			new HttpHost(U1MusicAPI.RESOURCE_HOST, -1, BaseClient.HTTPS);
+	
+	private HttpClient httpClient;
+	private U1MusicAPI musicApi;
+	
+	private U1PlaylistSongRequestListener playlistSongCallback;
+	
+	@Before
+	public void setUp() throws IOException {
+		httpResponse = Util.buildResponse(HttpStatus.SC_OK);
+				
+		httpClient = context.mock(HttpClient.class);
+		musicApi = new U1MusicAPI("ua/1.0", httpClient, new DummyAuthorizer());
+		
+		playlistSongCallback = context.mock(U1PlaylistSongRequestListener.class);
+	}
+	
+	@Test
+	public void testCreatePlaylistLifeCycleCallbacks() {
+		String name = "playlist name";
+		ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(playlistSongCallback).onStart();
+					inSequence(requestSequence);
+			
+			ignoring(httpClient);
+			allowing(playlistSongCallback).onSuccess(with(any(U1PlaylistSong.class)));
+			allowing(playlistSongCallback).onFailure(with(any(Failure.class)));
+			
+			oneOf(playlistSongCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.createPlaylist(name, songList, playlistSongCallback);
+	}
+	
+	@Test
+	public void testCreatePlaylist() throws IOException {
+		final U1Meta meta = new U1Meta();
+		String id = "playlistId";
+		String name = "playlist name";
+		ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final U1Song song1 = new U1SongBuilder()
+				.withId("songId1").withAlbumId("Song album 1").build();
+		songList.add(song1);
+		final U1PlaylistSong playlistSong1 = new U1PlaylistSong(id, name, song1);
+		
+		final U1Song song2 = new U1SongBuilder()
+				.withId("songId2").withAlbumId("Song album 2").build();
+		songList.add(song2);
+		final U1PlaylistSong playlistSong2 = new U1PlaylistSong(id, name, song2);
+		
+		final U1Song song3 = new U1SongBuilder()
+				.withId("songId3").withAlbumId("Song album 3").build();
+		songList.add(song3);
+		final U1PlaylistSong playlistSong3 = new U1PlaylistSong(id, name, song3);
+		
+		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
+				"/music/api/2.0/playlists/");
+		
+		httpRequest.setEntity(new StringEntity(U1CustomJson
+				.toSongIdListJson(name, songList)));
+		
+		String responseJson = U1ResponseBuilder.toJson(
+				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
+		
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(playlistSongCallback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong1));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong2));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong3));
+					inSequence(requestSequence);
+			
+			oneOf(playlistSongCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.createPlaylist(name, songList, playlistSongCallback);
+	}
+	
+	@Test
+	public void testUpdatePlaylist() throws IOException {
+		final U1Meta meta = new U1Meta();
+		String id = "playlistId";
+		String name = "playlist name";
+		ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final U1Song song1 = new U1SongBuilder()
+				.withId("songId1").withAlbumId("Song album 1").build();
+		songList.add(song1);
+		final U1PlaylistSong playlistSong1 = new U1PlaylistSong(id, name, song1);
+		
+		final U1Song song2 = new U1SongBuilder()
+				.withId("songId2").withAlbumId("Song album 2").build();
+		songList.add(song2);
+		final U1PlaylistSong playlistSong2 = new U1PlaylistSong(id, name, song2);
+		
+		final U1Song song3 = new U1SongBuilder()
+				.withId("songId3").withAlbumId("Song album 3").build();
+		songList.add(song3);
+		final U1PlaylistSong playlistSong3 = new U1PlaylistSong(id, name, song3);
+		
+		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
+				"/music/api/2.0/playlists/");
+		
+		httpRequest.setEntity(new StringEntity(U1CustomJson
+				.toSongIdListJson(name, songList)));
+		
+		String responseJson = U1ResponseBuilder.toJson(
+				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
+		
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(playlistSongCallback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong1));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong2));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong3));
+					inSequence(requestSequence);
+			
+			oneOf(playlistSongCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.createPlaylist(name, songList, playlistSongCallback);
+	}
+}
 
=== modified file 'src/test/com/ubuntuone/api/music/GetAlbumsTest.java'
--- src/test/com/ubuntuone/api/music/GetAlbumsTest.java	2012-08-21 14:13:25 +0000
+++ src/test/com/ubuntuone/api/music/GetAlbumsTest.java	2012-08-21 14:13:25 +0000
@@ -43,9 +43,11 @@
 import com.ubuntuone.api.music.client.BaseClient;
 import com.ubuntuone.api.music.client.Failure;
 import com.ubuntuone.api.music.model.U1Album;
+import com.ubuntuone.api.music.model.U1Artist;
 import com.ubuntuone.api.music.model.U1Meta;
 import com.ubuntuone.api.music.util.RequestListener.U1AlbumRequestListener;
 import com.ubuntuone.music.util.U1AlbumBuilder;
+import com.ubuntuone.music.util.U1ArtistBuilder;
 import com.ubuntuone.music.util.U1ResponseBuilder;
 import com.ubuntuone.music.util.Util;
 import com.ubuntuone.test.util.DummyAuthorizer;
@@ -164,4 +166,51 @@
 		
 		musicApi.getAlbums(albumCallback);
 	}
+	
+	@Test
+	public void testGetMultipleAlbumsByArtist() throws IOException {
+		final U1Meta meta = new U1Meta();
+		final U1Album album1 = new U1AlbumBuilder()
+				.withId("albumId1").withTitle("Album 1")
+				.withArtist("Artist 1").build();
+		final U1Album album2 = new U1AlbumBuilder()
+				.withId("albumId2").withTitle("Album 2")
+				.withArtist("Artist 2").build();
+		final U1Album album3 = new U1AlbumBuilder()
+				.withId("albumId3").withTitle("Album 3")
+				.withArtist("Artist 3").build();
+		
+		final U1Artist artist = new U1ArtistBuilder().build();
+		
+		httpRequest = new HttpGet(String.format(
+				"https://one.ubuntu.com/music/api/2.0/albums/%s/",
+				artist.getId()));
+		
+		String responseJson = U1ResponseBuilder.toJson(
+				meta, U1MusicAPI.ALBUMS, album1, album2, album3);
+		
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(albumCallback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(albumCallback).onSuccess(with(album1));
+					inSequence(requestSequence);
+			oneOf(albumCallback).onSuccess(with(album2));
+					inSequence(requestSequence);
+			oneOf(albumCallback).onSuccess(with(album3));
+					inSequence(requestSequence);
+			
+			oneOf(albumCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.getAlbumsByArtist(artist.getId(), albumCallback);
+	}
 }
 
=== removed file 'src/test/com/ubuntuone/api/music/PutPlaylistTest.java'
--- src/test/com/ubuntuone/api/music/PutPlaylistTest.java	2012-08-21 14:13:25 +0000
+++ src/test/com/ubuntuone/api/music/PutPlaylistTest.java	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/*
- * Ubuntu One Music Java library - communicate with Ubuntu One music API
- * 
- * Copyright 2012 Canonical Ltd.
- *   
- * This file is part of Ubuntu One Files Java library.
- *  
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses 
- */
-
-package com.ubuntuone.api.music;
-
-import static com.ubuntuone.test.util.SameHttpRequestMatcher.sameRequest;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.Sequence;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.ubuntuone.api.music.client.BaseClient;
-import com.ubuntuone.api.music.client.Failure;
-import com.ubuntuone.api.music.model.U1Meta;
-import com.ubuntuone.api.music.model.U1PlaylistSong;
-import com.ubuntuone.api.music.model.U1Song;
-import com.ubuntuone.api.music.util.RequestListener.U1PlaylistSongRequestListener;
-import com.ubuntuone.music.util.U1ResponseBuilder;
-import com.ubuntuone.music.util.U1SongBuilder;
-import com.ubuntuone.music.util.Util;
-import com.ubuntuone.test.util.DummyAuthorizer;
-
-@RunWith(JMock.class)
-public class PutPlaylistTest
-{
-	private final Mockery context = new JUnit4Mockery();
-
-	private HttpResponse httpResponse;
-	
-	private HttpHost httpHost =
-			new HttpHost(U1MusicAPI.RESOURCE_HOST, -1, BaseClient.HTTPS);
-	
-	private HttpClient httpClient;
-	private U1MusicAPI musicApi;
-	
-	private U1PlaylistSongRequestListener playlistSongCallback;
-	
-	@Before
-	public void setUp() throws IOException {
-		httpResponse = Util.buildResponse(HttpStatus.SC_OK);
-				
-		httpClient = context.mock(HttpClient.class);
-		musicApi = new U1MusicAPI("ua/1.0", httpClient, new DummyAuthorizer());
-		
-		playlistSongCallback = context.mock(U1PlaylistSongRequestListener.class);
-	}
-	
-	@Test
-	public void testCreatePlaylistLifeCycleCallbacks() {
-		String name = "playlist name";
-		ArrayList<U1Song> songList = new ArrayList<U1Song>();
-		
-		final Sequence requestSequence = context.sequence("lifecycle");
-		context.checking(new Expectations() {{
-			oneOf(playlistSongCallback).onStart();
-					inSequence(requestSequence);
-			
-			ignoring(httpClient);
-			allowing(playlistSongCallback).onSuccess(with(any(U1PlaylistSong.class)));
-			allowing(playlistSongCallback).onFailure(with(any(Failure.class)));
-			
-			oneOf(playlistSongCallback).onFinish();
-					inSequence(requestSequence);
-		}});
-		
-		musicApi.createPlaylist(name, songList, playlistSongCallback);
-	}
-	
-	@Test
-	public void testCreatePlaylist() throws IOException {
-		final U1Meta meta = new U1Meta();
-		String id = "playlistId";
-		String name = "playlist name";
-		ArrayList<U1Song> songList = new ArrayList<U1Song>();
-		
-		final U1Song song1 = new U1SongBuilder()
-				.withId("songId1").withAlbumId("Song album 1").build();
-		songList.add(song1);
-		final U1PlaylistSong playlistSong1 = new U1PlaylistSong(id, name, song1);
-		
-		final U1Song song2 = new U1SongBuilder()
-				.withId("songId2").withAlbumId("Song album 2").build();
-		songList.add(song2);
-		final U1PlaylistSong playlistSong2 = new U1PlaylistSong(id, name, song2);
-		
-		final U1Song song3 = new U1SongBuilder()
-				.withId("songId3").withAlbumId("Song album 3").build();
-		songList.add(song3);
-		final U1PlaylistSong playlistSong3 = new U1PlaylistSong(id, name, song3);
-		
-		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
-				"/music/api/2.0/playlists/");
-		
-		String responseJson = U1ResponseBuilder.toJson(
-				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
-		
-		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
-		
-		final Sequence requestSequence = context.sequence("lifecycle");
-		context.checking(new Expectations() {{
-			oneOf(playlistSongCallback).onStart();
-					inSequence(requestSequence);
-					
-			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
-					inSequence(requestSequence);
-							will(returnValue(httpResponse));
-			
-			oneOf(playlistSongCallback).onSuccess(with(playlistSong1));
-					inSequence(requestSequence);
-			oneOf(playlistSongCallback).onSuccess(with(playlistSong2));
-					inSequence(requestSequence);
-			oneOf(playlistSongCallback).onSuccess(with(playlistSong3));
-					inSequence(requestSequence);
-			
-			oneOf(playlistSongCallback).onFinish();
-					inSequence(requestSequence);
-		}});
-		
-		musicApi.createPlaylist(name, songList, playlistSongCallback);
-	}
-}
 
=== added file 'src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java'
--- src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java	1970-01-01 00:00:00 +0000
+++ src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java	2012-08-21 14:13:25 +0000
@@ -0,0 +1,157 @@
+/*
+ * Ubuntu One Music Java library - communicate with Ubuntu One music API
+ * 
+ * Copyright 2012 Canonical Ltd.
+ *   
+ * This file is part of Ubuntu One Files Java library.
+ *  
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses 
+ */
+
+package com.ubuntuone.api.music;
+
+import static com.ubuntuone.test.util.SameHttpRequestMatcher.sameRequest;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.Sequence;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ubuntuone.api.music.client.BaseClient;
+import com.ubuntuone.api.music.client.Failure;
+import com.ubuntuone.api.music.json.U1CustomJson;
+import com.ubuntuone.api.music.model.U1Meta;
+import com.ubuntuone.api.music.model.U1PlaylistSong;
+import com.ubuntuone.api.music.model.U1Song;
+import com.ubuntuone.api.music.util.RequestListener.U1PlaylistSongRequestListener;
+import com.ubuntuone.music.util.U1ResponseBuilder;
+import com.ubuntuone.music.util.U1SongBuilder;
+import com.ubuntuone.music.util.Util;
+import com.ubuntuone.test.util.DummyAuthorizer;
+
+@RunWith(JMock.class)
+public class UpdatePlaylistTest
+{
+	private final Mockery context = new JUnit4Mockery();
+
+	private HttpResponse httpResponse;
+	
+	private HttpHost httpHost =
+			new HttpHost(U1MusicAPI.RESOURCE_HOST, -1, BaseClient.HTTPS);
+	
+	private HttpClient httpClient;
+	private U1MusicAPI musicApi;
+	
+	private U1PlaylistSongRequestListener playlistSongCallback;
+	
+	@Before
+	public void setUp() throws IOException {
+		httpResponse = Util.buildResponse(HttpStatus.SC_OK);
+				
+		httpClient = context.mock(HttpClient.class);
+		musicApi = new U1MusicAPI("ua/1.0", httpClient, new DummyAuthorizer());
+		
+		playlistSongCallback = context.mock(U1PlaylistSongRequestListener.class);
+	}
+	
+	@Test
+	public void testCreatePlaylistLifeCycleCallbacks() {
+		String name = "playlist name";
+		ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(playlistSongCallback).onStart();
+					inSequence(requestSequence);
+			
+			ignoring(httpClient);
+			allowing(playlistSongCallback).onSuccess(with(any(U1PlaylistSong.class)));
+			allowing(playlistSongCallback).onFailure(with(any(Failure.class)));
+			
+			oneOf(playlistSongCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.createPlaylist(name, songList, playlistSongCallback);
+	}
+	
+	@Test
+	public void testCreatePlaylist() throws IOException {
+		final U1Meta meta = new U1Meta();
+		String id = "playlistId";
+		String name = "playlist name";
+		ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final U1Song song1 = new U1SongBuilder()
+				.withId("songId1").withAlbumId("Song album 1").build();
+		songList.add(song1);
+		final U1PlaylistSong playlistSong1 = new U1PlaylistSong(id, name, song1);
+		
+		final U1Song song2 = new U1SongBuilder()
+				.withId("songId2").withAlbumId("Song album 2").build();
+		songList.add(song2);
+		final U1PlaylistSong playlistSong2 = new U1PlaylistSong(id, name, song2);
+		
+		final U1Song song3 = new U1SongBuilder()
+				.withId("songId3").withAlbumId("Song album 3").build();
+		songList.add(song3);
+		final U1PlaylistSong playlistSong3 = new U1PlaylistSong(id, name, song3);
+		
+		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
+				"/music/api/2.0/playlists/");
+		
+		httpRequest.setEntity(new StringEntity(U1CustomJson
+				.toSongIdListJson(name, songList)));
+		
+		String responseJson = U1ResponseBuilder.toJson(
+				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
+		
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(playlistSongCallback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong1));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong2));
+					inSequence(requestSequence);
+			oneOf(playlistSongCallback).onSuccess(with(playlistSong3));
+					inSequence(requestSequence);
+			
+			oneOf(playlistSongCallback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.createPlaylist(name, songList, playlistSongCallback);
+	}
+}
 
=== added file 'src/test/com/ubuntuone/api/music/json/U1CustomJsonTest.java'
--- src/test/com/ubuntuone/api/music/json/U1CustomJsonTest.java	1970-01-01 00:00:00 +0000
+++ src/test/com/ubuntuone/api/music/json/U1CustomJsonTest.java	2012-08-21 14:13:25 +0000
@@ -0,0 +1,59 @@
+/*
+ * Ubuntu One Music Java library - communicate with Ubuntu One music API
+ * 
+ * Copyright 2012 Canonical Ltd.
+ *   
+ * This file is part of Ubuntu One Files Java library.
+ *  
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses 
+ */
+
+package com.ubuntuone.api.music.json;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import com.ubuntuone.api.music.model.U1Song;
+import com.ubuntuone.music.util.U1SongBuilder;
+
+public class U1CustomJsonTest
+{
+	@Test
+	public void testEncodeU1SongIdListPlaylist() throws IOException {
+		final ArrayList<U1Song> songList = new ArrayList<U1Song>();
+		
+		final U1Song song1 = new U1SongBuilder()
+				.withId("id1").build();
+		songList.add(song1);
+		final U1Song song2 = new U1SongBuilder()
+				.withId("id2").build();
+		songList.add(song2);
+		
+		String name = "the playlist name";
+		
+		String json = U1CustomJson.toSongIdListJson(name, songList);
+		
+		String expectedJson = "{\"name\":\"" + name + "\"," +
+				"\"song_id_list\":[" +
+				"\"" + song1.getId() + "\"," +
+				"\"" + song2.getId() + "\"" +
+				"]}";
+		
+		assertEquals(expectedJson, json);
+	}
+}
 
=== modified file 'src/test/com/ubuntuone/test/util/SameHttpRequestMatcher.java'
--- src/test/com/ubuntuone/test/util/SameHttpRequestMatcher.java	2012-08-21 14:13:25 +0000
+++ src/test/com/ubuntuone/test/util/SameHttpRequestMatcher.java	2012-08-21 14:13:25 +0000
@@ -21,7 +21,14 @@
 
 package com.ubuntuone.test.util;
 
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.util.EntityUtils;
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
@@ -40,6 +47,31 @@
 	public void describeTo(Description description) {
 		description.appendText("a request with request line ")
 				.appendValue(request.getRequestLine());
+		if (request.getClass() == HttpPost.class) {
+			HttpPost post = (HttpPost) request;
+			if (post.getEntity() != null) {
+				try {
+					description.appendText("and POST body ")
+							.appendValue(EntityUtils.toString(post.getEntity()));
+				} catch (ParseException e) {
+					description.appendText("and broken POST body!");
+				} catch (IOException e) {
+					description.appendText("and broken POST body!");
+				}
+			}
+		} else if (request.getClass() == HttpPut.class) {
+			HttpPut put = (HttpPut) request;
+			if (put.getEntity() != null) {
+				try {
+					description.appendText("and PUT body ")
+							.appendValue(EntityUtils.toString(put.getEntity()));
+				} catch (ParseException e) {
+					description.appendText("and broken PUT body ");
+				} catch (IOException e) {
+					description.appendText("and broken PUT body ");
+				}
+			}
+		}
 	}
 
 	@Override
@@ -48,8 +80,47 @@
 			return false;
 		if (item == request)
 			return true;
+		boolean sameBody = true;
+		if (request.getClass() == HttpPost.class) {
+			HttpPost postRequest = (HttpPost) request;
+			HttpPost postItem = (HttpPost) item;
+			if (postRequest.getEntity() != null) {
+				try {
+					InputStream in1 = postRequest.getEntity().getContent();
+					if (postItem.getEntity() != null) {
+						InputStream in2 = postItem.getEntity().getContent();
+						sameBody = StreamUtils.streamsHaveSameContent(in1, in2);
+					} else {
+						sameBody = false;
+					}
+				} catch (IllegalStateException e) {
+					return false;
+				} catch (IOException e) {
+					return false;
+				}
+			}
+		} else if (request.getClass() == HttpPut.class) {
+			HttpPut putRequest = (HttpPut) request;
+			HttpPut putItem = (HttpPut) item;
+			if (putRequest.getEntity() != null) {
+				try {
+					InputStream in1 = putRequest.getEntity().getContent();
+					if (putItem.getEntity() != null) {
+						InputStream in2 = putItem.getEntity().getContent();
+						sameBody = StreamUtils.streamsHaveSameContent(in1, in2);
+					} else {
+						sameBody = false;
+					}
+				} catch (IllegalStateException e) {
+					return false;
+				} catch (IOException e) {
+					return false;
+				}
+			}
+		}
 		return request.getMethod().equals(item.getMethod())
-				&& request.getURI().equals(item.getURI());
+				&& request.getURI().equals(item.getURI())
+				&& sameBody;
 	}
 	
 	@Factory
 
=== added file 'src/test/com/ubuntuone/test/util/StreamUtils.java'
--- src/test/com/ubuntuone/test/util/StreamUtils.java	1970-01-01 00:00:00 +0000
+++ src/test/com/ubuntuone/test/util/StreamUtils.java	2012-08-21 14:13:25 +0000
@@ -0,0 +1,27 @@
+package com.ubuntuone.test.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class StreamUtils
+{
+	public static boolean streamsHaveSameContent(InputStream in1, InputStream in2) {
+		boolean same = true;
+		int b1, b2;
+		try {
+			while ((b1 = in1.read()) != -1) {
+				b2 = in2.read();
+				if (b1 != b2) {
+					same = false;
+					break;
+				}
+			}
+			if (in2.read() != -1) {
+				same = false;
+			}
+		} catch (IOException e) {
+			same = false;
+		}
+		return same;
+	}
+}