Merge pull request #25 from FelixGail/develop

Release 0.3.1

Author: FelixGail

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.felixgail</groupId>
     <artifactId>gplaymusic</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <url>https://github.com/felixgail/gplaymusic</url>

src/main/java/com/github/felixgail/gplaymusic/api/GPlayService.java

@@ -169,7 +169,7 @@ Call<Void> getTrackLocationSongId(@Header("X-Device-ID") String androidID,
   @GET("sj/v2.5/fetchartist")
   Call<Artist> getArtist(@Query("nid") String artistID, @Query("include-albums") boolean includeAlbums,
                          @Query("num-top-tracks") int numTopTracks,
-                         @Query("num-related-artist") int numRelArtist);
+                         @Query("num-related-artists") int numRelArtist);
 
   default MutationResponse makeBatchCall(String path, Mutator body)
       throws IOException {

src/test/java/com/github/felixgail/gplaymusic/ArtistTest.java

@@ -0,0 +1,48 @@
+package com.github.felixgail.gplaymusic;
+
+import com.github.felixgail.gplaymusic.model.Artist;
+import com.github.felixgail.gplaymusic.model.enums.ResultType;
+import com.github.felixgail.gplaymusic.model.requests.SearchTypes;
+import com.github.felixgail.gplaymusic.util.TestUtil;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import svarzee.gps.gpsoauth.Gpsoauth;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.github.felixgail.gplaymusic.TestWithLogin.getApi;
+import static com.github.felixgail.gplaymusic.TestWithLogin.loginToService;
+
+public class ArtistTest {
+
+  @BeforeClass
+  public static void before() throws IOException, Gpsoauth.TokenRequestFailed {
+    loginToService(TestUtil.USERNAME, TestUtil.PASSWORD, TestUtil.ANDROID_ID, TestUtil.TOKEN);
+  }
+
+  @Test
+  public void testRelatedArtists() throws IOException {
+    List<Artist> artistList = getApi().search("John", new SearchTypes(ResultType.ARTIST)).getArtists();
+    Assert.assertNotNull(artistList);
+    Assert.assertNotEquals(0, artistList.size());
+    int relArtistNum = 0;
+    for(Artist artist : artistList) {
+      if(artist.getArtistId().isPresent()) {
+        artist = getApi().getArtist(artist.getArtistId().get(), false, 0, 10);
+        Assert.assertNotNull(artist);
+        if(artist.getRelatedArtists().isPresent()){
+          relArtistNum += 1;
+          Assert.assertNotEquals(0, artist.getRelatedArtists().get().size());
+        }
+      }
+    }
+    Assert.assertNotEquals(
+        String.format("No Artist (of %d) had a list of related artists", artistList.size()), 0,
+        relArtistNum);
+    System.out.printf("%d of %d artists had a list of related artists\n", relArtistNum, artistList.size());
+  }
+
+
+}