Merge pull request #546 from XiangRongLin/unignore2

Unignore more tests

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.extractor.services.peertube;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.downloader.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.ExtractorAsserts;
@@ -46,7 +45,6 @@ public class PeertubePlaylistExtractorTest {
         }
 
         @Test
-        @Ignore("TODO fix")
         public void testGetUploaderName() throws ParsingException {
             assertEquals("Méta de Choc", extractor.getUploaderName());
         }

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java

@@ -96,7 +96,7 @@ public class PeertubeStreamExtractorTest {
         @Override public int expectedStreamSegmentsCount() { return 0; }
     }
 
-    @Ignore("TODO fix")
+    @Ignore("Test broken, SSL problem")
     public static class AgeRestricted extends DefaultStreamExtractorTest {
         private static final String ID = "dbd8e5e1-c527-49b6-b70c-89101dbb9c08";
         private static final String INSTANCE = "https://nocensoring.net";

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/search/PeertubeSearchQHTest.java

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.extractor.services.peertube.search;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
 import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeSearchQueryHandlerFactory;
@@ -19,7 +18,6 @@ public class PeertubeSearchQHTest {
     }
 
     @Test
-    @Ignore("TODO fix")
     public void testRegularValues() throws Exception {
         assertEquals("https://peertube.mastodon.host/api/v1/search/videos?search=asdf", PeerTube.getSearchQHFactory().fromQuery("asdf").getUrl());
         assertEquals("https://peertube.mastodon.host/api/v1/search/videos?search=hans", PeerTube.getSearchQHFactory().fromQuery("hans").getUrl());

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

@@ -377,7 +377,7 @@ public class SoundcloudPlaylistExtractorTest {
         }
 
         @Test
-        @Ignore("TODO fix")
+        @Ignore("Test broken? Playlist has 2 entries, each page has 1 entry meaning it has 2 pages.")
         public void testMoreRelatedItems() throws Exception {
             try {
                 defaultTestMoreItems(extractor);

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java

@@ -59,7 +59,7 @@ public class YoutubePlaylistExtractorTest {
         }
 
         @Test(expected = ContentNotAvailableException.class)
-        @Ignore("TODO fix")
+        @Ignore("Broken, now invalid playlists redirect to youtube homepage")
         public void invalidId() throws Exception {
             final PlaylistExtractor extractor =
                     YouTube.getPlaylistExtractor("https://www.youtube.com/playlist?list=INVALID_ID");

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorControversialTest.java

@@ -21,7 +21,7 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 /**
  * Test for {@link YoutubeStreamLinkHandlerFactory}
  */
-@Ignore("Video is not available anymore")
+@Ignore("Video is not available in specific countries. Someone else has to generate mocks")
 public class YoutubeStreamExtractorControversialTest extends DefaultStreamExtractorTest {
     private static final String RESOURCE_PATH = DownloaderFactory.RESOURCE_PATH + "services/youtube/extractor/stream/";
     private static final String ID = "T4XJQO3qol8";

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java

@@ -16,7 +16,6 @@ import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamSegment;
 import org.schabi.newpipe.extractor.stream.StreamType;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,6 +23,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
@@ -140,10 +141,10 @@ public class YoutubeStreamExtractorDefaultTest {
         @Override public String expectedUploaderName() { return "Unbox Therapy"; }
         @Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCsTcErHg8oDvUnTzoqsYeNw"; }
         @Override public List<String> expectedDescriptionContains() {
-            return Arrays.asList("https://www.youtube.com/watch?v=X7FLCHVXpsA&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
+            return Arrays.asList("https://www.youtube.com/watch?v=X7FLCHVXpsA&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
-                    "https://www.youtube.com/watch?v=Lqv6G0pDNnw&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
+                    "https://www.youtube.com/watch?v=Lqv6G0pDNnw&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
-                    "https://www.youtube.com/watch?v=XxaRBPyrnBU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
+                    "https://www.youtube.com/watch?v=XxaRBPyrnBU&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34",
-                    "https://www.youtube.com/watch?v=U-9tUEOFKNU&amp;list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34");
+                    "https://www.youtube.com/watch?v=U-9tUEOFKNU&list=PL7u4lWXQ3wfI_7PgX0C-VTiwLeu0S4v34");
         }
         @Override public long expectedLength() { return 434; }
         @Override public long expectedViewCountAtLeast() { return 21229200; }
@@ -153,16 +154,9 @@ public class YoutubeStreamExtractorDefaultTest {
         @Override public long expectedDislikeCountAtLeast() { return 18700; }
         @Override public boolean expectedUploaderVerified() { return true; }
         // @formatter:on
-        @Override
-        @Test
-        @Ignore("TODO fix")
-        public void testDescription() throws Exception {
-            super.testDescription();
-        }
-
     }
 
-    @Ignore("TODO fix")
+    @Ignore("Test broken, video was made private")
     public static class RatingsDisabledTest extends DefaultStreamExtractorTest {
         private static final String ID = "HRKu0cvrr_o";
         private static final int TIMESTAMP = 17;
@@ -344,20 +338,6 @@ public class YoutubeStreamExtractorDefaultTest {
         }
         @Override public boolean expectedUploaderVerified() { return true; }
         // @formatter:on
-        @Override
-        @Ignore("TODO fix")
-        @Test
-        public void testUploaderName() throws Exception {
-            super.testUploaderName();
-        }
-
-        @Override
-        @Ignore("TODO fix")
-        @Test
-        public void testMetaInfo() throws Exception {
-            super.testMetaInfo();
-        }
-
     }
 
 }