Merge pull request #114 from kaaes/fix_109

Fixes #109

Author: kaaes

…y/webapi/android/SpotifyServiceTest.java …i/android/SpotifyServiceAndroidTest.javaspotify-api/src/androidTest/java/kaaes/spotify/webapi/android/SpotifyServiceTest.java renamed to spotify-api/src/androidTest/java/kaaes/spotify/webapi/android/SpotifyServiceAndroidTest.java spotify-api/src/androidTest/java/kaaes/spotify/webapi/android/SpotifyServiceTest.java renamed to spotify-api/src/androidTest/java/kaaes/spotify/webapi/android/SpotifyServiceAndroidTest.java

@@ -16,14 +16,22 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import kaaes.spotify.webapi.android.models.Album;
 import kaaes.spotify.webapi.android.models.AlbumsPager;
 import kaaes.spotify.webapi.android.models.Artist;
+import kaaes.spotify.webapi.android.models.ArtistsCursorPager;
 import kaaes.spotify.webapi.android.models.Pager;
 import kaaes.spotify.webapi.android.models.Playlist;
 import kaaes.spotify.webapi.android.models.PlaylistSimple;
 import kaaes.spotify.webapi.android.models.Track;
 import kaaes.spotify.webapi.android.models.Tracks;
+import retrofit.Callback;
+import retrofit.RetrofitError;
 
 import static junit.framework.Assert.assertEquals;
 
@@ -36,7 +44,7 @@
  * Running the tests:
  * ./gradlew :spotify-api:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.access_token=valid_access_token
  */
-public class SpotifyServiceTest {
+public class SpotifyServiceAndroidTest {
 
     private Gson mGson = new GsonBuilder().create();
     private OkHttpClient mClient = new OkHttpClient();
@@ -167,6 +175,74 @@ public void getMyPlaylist() throws Exception {
         compareAsJSON(response, playlist);
     }
 
+    @Test
+    public void getFollowedArtists() throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        final ArtistsCursorPager[] payload = {null};
+
+        mService.getFollowedArtists(new Callback<ArtistsCursorPager>() {
+            @Override
+            public void success(ArtistsCursorPager artistsCursorPager, retrofit.client.Response response) {
+                payload[0] = artistsCursorPager;
+                latch.countDown();
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+                latch.countDown();
+            }
+        });
+
+        latch.await(1, TimeUnit.SECONDS);
+
+        Request request = new Request.Builder()
+                .get()
+                .headers(mAuthHeader)
+                .url("https://api.spotify.com/v1/me/following?type=artist")
+                .build();
+
+        Response response = mClient.newCall(request).execute();
+        assertEquals(200, response.code());
+
+        compareAsJSON(response, payload[0]);
+    }
+
+    @Test
+    public void getFollowedArtistsWithOptions() throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        final ArtistsCursorPager[] payload = {null};
+
+        Map<String, Object> options = new HashMap<>();
+        options.put(SpotifyService.LIMIT, 45);
+        mService.getFollowedArtists(options, new Callback<ArtistsCursorPager>() {
+            @Override
+            public void success(ArtistsCursorPager artistsCursorPager, retrofit.client.Response response) {
+                payload[0] = artistsCursorPager;
+                latch.countDown();
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+                latch.countDown();
+            }
+        });
+
+        latch.await(1, TimeUnit.SECONDS);
+
+        Request request = new Request.Builder()
+                .get()
+                .headers(mAuthHeader)
+                .url("https://api.spotify.com/v1/me/following?type=artist&limit=45")
+                .build();
+
+        Response response = mClient.newCall(request).execute();
+        assertEquals(200, response.code());
+
+        compareAsJSON(response, payload[0]);
+    }
+
     private void compareAsJSON(Response response, Object model) throws Exception {
         JsonParser parser = new JsonParser();
 

spotify-api/src/main/java/kaaes/spotify/webapi/android/SpotifyService.java

@@ -1438,7 +1438,7 @@ public interface SpotifyService {
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    Result getFollowedArtists(Callback<ArtistsCursorPager> callback);
+    void getFollowedArtists(Callback<ArtistsCursorPager> callback);
 
     /**
      * Get the current user's followed artists.
@@ -1461,7 +1461,7 @@ public interface SpotifyService {
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    Result getFollowedArtists(@QueryMap Map<String, Object> options, Callback<ArtistsCursorPager> callback);
+    void getFollowedArtists(@QueryMap Map<String, Object> options, Callback<ArtistsCursorPager> callback);
 
     /**********
      * Search *