Merge pull request #59 from coffeemakr/bugfix-test-urls-and-relative-fix

Add more tests and fix 2 bugs

Author: mauriciocolli

src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudExtractorHelper.java

@@ -0,0 +1,35 @@
+package org.schabi.newpipe.extractor.services.soundcloud;
+
+import com.grack.nanojson.JsonObject;
+
+import javax.annotation.Nonnull;
+
+public class SoundcloudExtractorHelper {
+    
+    private static final String HTTP = "http://";
+    private static final String HTTPS = "https://";
+
+
+    private static String replaceHttpWithHttps(final String url) {
+        if(!url.isEmpty() && url.startsWith(HTTP)) {
+            return HTTPS + url.substring(HTTP.length());
+        }
+        return url;
+    }
+
+    @Nonnull
+    static String getUploaderUrl(JsonObject object) {
+        String url = object.getObject("user").getString("permalink_url", "");
+        return replaceHttpWithHttps(url);
+    }
+
+    @Nonnull
+    static String getAvatarUrl(JsonObject object) {
+        String url = object.getObject("user", new JsonObject()).getString("avatar_url", "");
+        return replaceHttpWithHttps(url);
+    }
+
+    public static String getUploaderName(JsonObject object) {
+        return object.getObject("user").getString("username", "");
+    }
+}

src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java

@@ -4,7 +4,6 @@
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -69,17 +68,17 @@ public String getBannerUrl() {
 
     @Override
     public String getUploaderUrl() {
-        return playlist.getObject("user").getString("permalink_url", "");
+        return SoundcloudExtractorHelper.getUploaderUrl(playlist);
     }
 
     @Override
     public String getUploaderName() {
-        return playlist.getObject("user").getString("username", "");
+        return SoundcloudExtractorHelper.getUploaderName(playlist);
     }
 
     @Override
     public String getUploaderAvatarUrl() {
-        return playlist.getObject("user", new JsonObject()).getString("avatar_url", "");
+        return SoundcloudExtractorHelper.getAvatarUrl(playlist);
     }
 
     @Override

src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java

@@ -102,19 +102,19 @@ public long getDislikeCount() {
     @Nonnull
     @Override
     public String getUploaderUrl() {
-        return track.getObject("user").getString("permalink_url", "");
+        return SoundcloudExtractorHelper.getUploaderUrl(track);
     }
 
     @Nonnull
     @Override
     public String getUploaderName() {
-        return track.getObject("user").getString("username", "");
+        return SoundcloudExtractorHelper.getUploaderName(track);
     }
 
     @Nonnull
     @Override
     public String getUploaderAvatarUrl() {
-        return track.getObject("user", new JsonObject()).getString("avatar_url", "");
+        return SoundcloudExtractorHelper.getAvatarUrl(track);
     }
 
     @Override

src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java

@@ -265,7 +265,7 @@ public String getUploaderName() throws ParsingException {
 
                 @Override
                 public String getUploaderUrl() throws ParsingException {
-                    return getUploaderLink().attr("href");
+                    return getUploaderLink().attr("abs:href");
                 }
 
                 @Override

src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java

@@ -100,7 +100,7 @@ public String getUploaderUrl() throws ParsingException {
             try {
                 return item.select("div[class=\"yt-lockup-byline\"]").first()
                         .select("a").first()
-                        .attr("href");
+                        .attr("abs:href");
             } catch (Exception e){}
 
             // try this if the first didn't work

src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractor.java

@@ -110,7 +110,7 @@ public String getName() throws ParsingException {
                     @Override
                     public String getUploaderUrl() throws ParsingException {
                         try {
-                            String link = getUploaderLink().attr("href");
+                            String link = getUploaderLink().attr("abs:href");
                             if (link.isEmpty()) {
                                 throw new IllegalArgumentException("is empty");
                             }

src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java

@@ -1,9 +1,12 @@
 package org.schabi.newpipe.extractor;
 
+import javax.annotation.Nonnull;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 public class ExtractorAsserts {
     public static void assertEmptyErrors(String message, List<Throwable> errors) {
         if(!errors.isEmpty()) {
@@ -14,11 +17,21 @@ public static void assertEmptyErrors(String message, List<Throwable> errors) {
         }
     }
 
-    public static void assertIsValidUrl(String url) {
+    @Nonnull
+    private static URL urlFromString(String url) {
         try {
-            new URL(url);
+            return new URL(url);
         } catch (MalformedURLException e) {
             throw new AssertionError("Invalid url: " + url, e);
         }
     }
+
+    public static void assertIsValidUrl(String url) {
+        urlFromString(url);
+    }
+
+    public static void assertIsSecureUrl(String urlToCheck) {
+        URL url = urlFromString(urlToCheck);
+        assertEquals("Protocol of URL is not secure", "https", url.getProtocol());
+    }
 }

src/test/java/org/schabi/newpipe/extractor/services/soundcloud/BaseSoundcloudSearchTest.java

@@ -0,0 +1,57 @@
+package org.schabi.newpipe.extractor.services.soundcloud;
+
+import org.junit.Test;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
+
+public abstract class BaseSoundcloudSearchTest {
+
+    protected static SearchResult result;
+
+    @Test
+    public void testResultList() {
+        assertFalse("Got empty result list", result.resultList.isEmpty());
+        for(InfoItem infoItem: result.resultList) {
+            assertIsSecureUrl(infoItem.getUrl());
+            assertIsSecureUrl(infoItem.getThumbnailUrl());
+            assertFalse(infoItem.getName().isEmpty());
+            assertFalse("Name is probably a URI: " + infoItem.getName(),
+                    infoItem.getName().contains("://"));
+            if(infoItem instanceof StreamInfoItem) {
+                // test stream item
+                StreamInfoItem streamInfoItem = (StreamInfoItem) infoItem;
+                assertIsSecureUrl(streamInfoItem.getUploaderUrl());
+                assertFalse(streamInfoItem.getUploadDate().isEmpty());
+                assertFalse(streamInfoItem.getUploaderName().isEmpty());
+                assertEquals(StreamType.AUDIO_STREAM, streamInfoItem.getStreamType());
+            } else if(infoItem instanceof ChannelInfoItem) {
+                // Nothing special to check?
+            } else if(infoItem instanceof PlaylistInfoItem)  {
+                // test playlist item
+                assertTrue(infoItem.getUrl().contains("/sets/"));
+                long streamCount = ((PlaylistInfoItem) infoItem).getStreamCount();
+                assertTrue(streamCount > 0);
+            } else {
+                fail("Unknown infoItem type: " + infoItem);
+            }
+        }
+    }
+
+    @Test
+    public void testResultErrors() {
+        assertNotNull(result.errors);
+        if (!result.errors.isEmpty()) {
+            for (Throwable error : result.errors) {
+                error.printStackTrace();
+            }
+        }
+        assertTrue(result.errors.isEmpty());
+    }
+}

src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java

@@ -8,6 +8,7 @@
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 
 import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
 import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
 
 /**
@@ -43,7 +44,7 @@ public void testGetDescription() throws Exception {
 
     @Test
     public void testGetAvatarUrl() throws Exception {
-        assertTrue(extractor.getAvatarUrl().contains("https://"));
+        assertIsSecureUrl(extractor.getAvatarUrl());
     }
 
     @Test

src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java

@@ -8,6 +8,7 @@
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 
 import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
 import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
 
 /**
@@ -42,12 +43,13 @@ public void testGetName() throws Exception {
 
     @Test
     public void testGetThumbnailUrl() throws Exception {
-        assertTrue(extractor.getThumbnailUrl(), extractor.getThumbnailUrl().contains("https://"));
+        assertIsSecureUrl(extractor.getThumbnailUrl());
     }
 
     @Test
     public void testGetUploaderUrl() throws Exception {
-        assertEquals(extractor.getUploaderUrl(), "http://soundcloud.com/liluzivert");
+        assertIsSecureUrl(extractor.getUploaderUrl());
+        assertEquals(extractor.getUploaderUrl(), "https://soundcloud.com/liluzivert");
     }
 
     @Test
@@ -57,7 +59,7 @@ public void testGetUploaderName() throws Exception {
 
     @Test
     public void testGetUploaderAvatarUrl() throws Exception {
-        assertTrue(extractor.getUploaderAvatarUrl(), extractor.getUploaderAvatarUrl().contains("https://"));
+        assertIsSecureUrl(extractor.getUploaderAvatarUrl());
     }
 
     @Test