Try to fix tests

- Fix double youtube package

.gitignore

@@ -1,5 +1,7 @@
 .gradle
 /build/
+.idea
+local.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;

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

@@ -1,9 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import java.util.EnumSet;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -12,6 +7,11 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
 
 /**
  * Created by Christian Schabesberger on 29.12.15.
@@ -44,7 +44,9 @@ public class YoutubeSearchEngineAllTest {
         NewPipe.init(Downloader.getInstance());
         SearchEngine engine = NewPipe.getService("Youtube").getSearchEngineInstance();
 
-        result = engine.search("asdf", 0, "de",
+        // Youtube will suggest "asdf" instead of "asdgff"
+        // keep in mind that the suggestions can change by country (the parameter "de")
+        result = engine.search("asdgff", 0, "de",
                 EnumSet.of(SearchEngine.Filter.CHANNEL,
                         SearchEngine.Filter.STREAM)).getSearchResult();
     }
@@ -56,6 +58,7 @@ public class YoutubeSearchEngineAllTest {
 
     @Test
     public void testResultErrors() {
+        if (!result.errors.isEmpty()) for (Throwable error : result.errors) error.printStackTrace();
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 

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

@@ -1,10 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import java.util.EnumSet;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -14,6 +8,12 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
 
 /**
  * Created by Christian Schabesberger on 29.12.15.
@@ -46,7 +46,9 @@ public class YoutubeSearchEngineChannelTest {
         NewPipe.init(Downloader.getInstance());
         SearchEngine engine = NewPipe.getService("Youtube").getSearchEngineInstance();
 
-        result = engine.search("gronkh", 0, "de",
+        // Youtube will suggest "gronkh" instead of "grrunkh"
+        // keep in mind that the suggestions can change by country (the parameter "de")
+        result = engine.search("grrunkh", 0, "de",
                 EnumSet.of(SearchEngine.Filter.CHANNEL)).getSearchResult();
     }
 
@@ -62,6 +64,7 @@ public class YoutubeSearchEngineChannelTest {
 
     @Test
     public void testResultErrors() {
+        if (!result.errors.isEmpty()) for (Throwable error : result.errors) error.printStackTrace();
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 

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

@@ -1,10 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import java.util.EnumSet;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -14,6 +8,12 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
 
 /**
  * Created by Christian Schabesberger on 29.12.15.
@@ -46,7 +46,9 @@ public class YoutubeSearchEngineStreamTest {
         NewPipe.init(Downloader.getInstance());
         SearchEngine engine = NewPipe.getService("Youtube").getSearchEngineInstance();
 
-        result = engine.search("this is something boring", 0, "de",
+        // Youtube will suggest "results" instead of "rsults",
+        // keep in mind that the suggestions can change by country (the parameter "de")
+        result = engine.search("rsults", 0, "de",
                 EnumSet.of(SearchEngine.Filter.STREAM)).getSearchResult();
     }
 
@@ -62,6 +64,7 @@ public class YoutubeSearchEngineStreamTest {
 
     @Test
     public void testResultErrors() {
+        if (!result.errors.isEmpty()) for (Throwable error : result.errors) error.printStackTrace();
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
 import static junit.framework.Assert.assertTrue;
 

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

@@ -1,52 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
-
-import static junit.framework.Assert.assertFalse;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.SuggestionExtractor;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeSuggestionExtractor;
-
-/**
- * Created by Christian Schabesberger on 18.11.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeSearchResultTest.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Test for {@link SuggestionExtractor}
- */
-public class YoutubeSearchResultTest {
-    List<String> suggestionReply;
-
-
-    @Before
-    public void setUp() throws Exception {
-        NewPipe.init(Downloader.getInstance());
-        SuggestionExtractor engine = new YoutubeSuggestionExtractor(0);
-        suggestionReply = engine.suggestionList("hello", "de");
-    }
-
-    @Test
-    public void testIfSuggestions() {
-        assertFalse(suggestionReply.isEmpty());
-    }
-}

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

@@ -1,55 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
-
-import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-
-/**
- * Created by Christian Schabesberger on 30.12.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeVideoExtractorGema.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-// This class only works in Germany.
-/**
- * Test for {@link YoutubeStreamExtractor}
- */
-public class YoutubeStreamExtractorGemaTest {
-
-    // Deaktivate this Test Case bevore uploading it githup, otherwise CI will fail.
-    private static final boolean testActive = false;
-
-    @Test
-    public void testGemaError() throws IOException, ExtractionException {
-        if(testActive) {
-            try {
-                NewPipe.init(Downloader.getInstance());
-                NewPipe.getService("Youtube")
-                        .getStreamExtractorInstance("https://www.youtube.com/watch?v=3O1_3zBUKM8");
-            } catch(YoutubeStreamExtractor.GemaException ge) {
-                assertTrue(true);
-            }
-        }
-    }
-}

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

@@ -1,108 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
-
-import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
-import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.VideoStream;
-
-/**
- * Test for {@link YoutubeStreamUrlIdHandler}
- */
-public class YoutubeStreamExtractorRestrictedTest {
-    public static final String HTTPS = "https://";
-    private StreamExtractor extractor;
-
-    @Before
-    public void setUp() throws Exception {
-        NewPipe.init(Downloader.getInstance());
-        extractor = NewPipe.getService("Youtube")
-                .getStreamExtractorInstance("https://www.youtube.com/watch?v=i6JTvzrpBy0");
-    }
-
-    @Test
-    public void testGetInvalidTimeStamp() throws ParsingException {
-        assertTrue(Integer.toString(extractor.getTimeStamp()),
-                extractor.getTimeStamp() <= 0);
-    }
-
-    @Test
-    public void testGetValidTimeStamp() throws ExtractionException, IOException {
-        StreamExtractor extractor= NewPipe.getService("Youtube")
-                .getStreamExtractorInstance("https://youtu.be/FmG385_uUys?t=174");
-        assertTrue(Integer.toString(extractor.getTimeStamp()),
-                extractor.getTimeStamp() == 174);
-    }
-
-    @Test
-    public void testGetAgeLimit() throws ParsingException {
-        assertTrue(extractor.getAgeLimit() == 18);
-    }
-
-    @Test
-    public void testGetTitle() throws ParsingException {
-        assertTrue(!extractor.getTitle().isEmpty());
-    }
-
-    @Test
-    public void testGetDescription() throws ParsingException {
-        assertTrue(extractor.getDescription() != null);
-    }
-
-    @Test
-    public void testGetUploader() throws ParsingException {
-        assertTrue(!extractor.getUploader().isEmpty());
-    }
-
-    @Test
-    public void testGetLength() throws ParsingException {
-        assertTrue(extractor.getLength() > 0);
-    }
-
-    @Test
-    public void testGetViews() throws ParsingException {
-        assertTrue(extractor.getLength() > 0);
-    }
-
-    @Test
-    public void testGetUploadDate() throws ParsingException {
-        assertTrue(extractor.getUploadDate().length() > 0);
-    }
-
-    @Test
-    public void testGetThumbnailUrl() throws ParsingException {
-        assertTrue(extractor.getThumbnailUrl(),
-                extractor.getThumbnailUrl().contains(HTTPS));
-    }
-
-    @Test
-    public void testGetUploaderThumbnailUrl() throws ParsingException {
-        assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains(HTTPS));
-    }
-
-    @Test
-    public void testGetAudioStreams() throws ParsingException {
-        // audiostream not always necessary
-        //assertTrue(!extractor.getAudioStreams().isEmpty());
-    }
-
-    @Test
-    public void testGetVideoStreams() throws ParsingException {
-        for(VideoStream s : extractor.getVideoStreams()) {
-            assertTrue(s.url,
-                    s.url.contains(HTTPS));
-            assertTrue(s.resolution.length() > 0);
-            assertTrue(Integer.toString(s.format),
-                    0 <= s.format && s.format <= 4);
-        }
-    }
-}

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

@@ -1,119 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube.youtube;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.FoundAdException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
-
-/**
- * Test for {@link YoutubeStreamUrlIdHandler}
- */
-public class YoutubeStreamUrlIdHandlerTest {
-    private static String AD_URL = "https://googleads.g.doubleclick.net/aclk?sa=l&ai=C-2IPgeVTWPf4GcOStgfOnIOADf78n61GvKmmobYDrgIQASDj-5MDKAJg9ZXOgeAEoAGgy_T-A8gBAakC2gkpmquIsT6oAwGqBJMBT9BgD5kVgbN0dX602bFFaDw9vsxq-We-S8VkrXVBi6W_e7brZ36GCz1WO3EPEeklYuJjXLUowwCOKsd-8xr1UlS_tusuFJv9iX35xoBHKTRvs8-0aDbfEIm6in37QDfFuZjqgEMB8-tg0Jn_Pf1RU5OzbuU40B4Gy25NUTnOxhDKthOhKBUSZEksCEerUV8GMu10iAXCxquwApIFBggDEAEYAaAGGsgGlIjthrUDgAfItIsBqAemvhvYBwHSCAUIgGEQAbgT6AE&num=1&sig=AOD64_1DybDd4qAm5O7o9UAbTNRdqXXHFQ&ctype=21&video_id=dMO_IXYPZew&client=ca-pub-6219811747049371&adurl=http://www.youtube.com/watch%3Fv%3DdMO_IXYPZew";
-    private YoutubeStreamUrlIdHandler urlIdHandler;
-
-    @Before
-    public void setUp() throws Exception {
-        urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
-        NewPipe.init(Downloader.getInstance());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void getIdWithNullAsUrl() throws ParsingException {
-        urlIdHandler.getId(null);
-    }
-
-    @Test(expected = FoundAdException.class)
-    public void getIdForAd() throws ParsingException {
-        urlIdHandler.getId(AD_URL);
-    }
-
-    @Test
-    public void getIdForInvalidUrls() throws ParsingException {
-        List<String> invalidUrls = new ArrayList<>(50);
-        invalidUrls.add("https://www.youtube.com/watch?v=jZViOEv90d");
-        invalidUrls.add("https://www.youtube.com/watchjZViOEv90d");
-        invalidUrls.add("https://www.youtube.com/");
-        for(String invalidUrl: invalidUrls) {
-            Throwable exception = null;
-            try {
-                urlIdHandler.getId(invalidUrl);
-            } catch (ParsingException e) {
-                exception = e;
-            }
-            if(exception == null) {
-                fail("Expected ParsingException for url: " + invalidUrl);
-            }
-        }
-    }
-    @Test
-    public void getId() throws Exception {
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertEquals("W-fFHeTX70Q", urlIdHandler.getId("https://www.youtube.com/watch?v=W-fFHeTX70Q"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://WWW.YouTube.com/watch?v=jZViOEv90dI?t=100"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("HTTPS://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://youtu.be/jZViOEv90dI?t=9s"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("HTTPS://Youtu.be/jZViOEv90dI?t=9s"));
-        assertEquals("uEJuoEs1UxY", urlIdHandler.getId("http://www.youtube.com/watch_popup?v=uEJuoEs1UxY"));
-        assertEquals("uEJuoEs1UxY", urlIdHandler.getId("http://www.Youtube.com/watch_popup?v=uEJuoEs1UxY"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/embed/jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube-nocookie.com/embed/jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://youtube.com/watch?v=jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://youtu.be/jZViOEv90dI?t=9s"));
-        assertEquals("7_WWz2DSnT8", urlIdHandler.getId("https://youtu.be/7_WWz2DSnT8"));
-        assertEquals("oy6NvWeVruY", urlIdHandler.getId("https://m.youtube.com/watch?v=oy6NvWeVruY"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube.com/embed/jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.Youtube.com/embed/jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube-nocookie.com/embed/jZViOEv90dI"));
-        assertEquals("EhxJLojIE_o", urlIdHandler.getId("http://www.youtube.com/attribution_link?a=JdfC0C9V6ZI&u=%2Fwatch%3Fv%3DEhxJLojIE_o%26feature%3Dshare"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("vnd.youtube://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertEquals("jZViOEv90dI", urlIdHandler.getId("vnd.youtube:jZViOEv90dI"));
-
-        // Shared links
-        String sharedId = "7JIArTByb3E";
-        String realId = "Q7JsK50NGaA";
-        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.YouTube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
-        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
-        assertEquals(realId, urlIdHandler.getId("https://www.youtube.com/shared?ci=7JIArTByb3E"));
-
-    }
-
-
-    @Test
-    public void testAcceptUrl() {
-        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
-        assertTrue(urlIdHandler.acceptUrl("https://WWW.YouTube.com/watch?v=jZViOEv90dI?t=100"));
-        assertTrue(urlIdHandler.acceptUrl("HTTPS://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
-        assertTrue(urlIdHandler.acceptUrl("https://youtu.be/jZViOEv90dI?t=9s"));
-        //assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch/jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/embed/jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("https://www.youtube-nocookie.com/embed/jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("http://youtu.be/jZViOEv90dI?t=9s"));
-        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/embed/jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("http://www.youtube-nocookie.com/embed/jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/attribution_link?a=JdfC0C9V6ZI&u=%2Fwatch%3Fv%3DEhxJLojIE_o%26feature%3Dshare"));
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/watch?v=jZViOEv90dI"));
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube:jZViOEv90dI"));
-
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube:jZViOEv90dI"));
-
-        String sharedId = "8A940MXKFmQ";
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
-        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/shared?ci=" + sharedId));
-    }
-}