From 38c5cb50fbc173e25d61b7313cba6d47057355eb Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sat, 24 Dec 2016 17:11:29 +0100 Subject: [PATCH] fixed Downloader.getInstance() in unit tests --- .../extractor/youtube/YoutubeChannelExtractorTest.java | 2 +- .../newpipe/extractor/youtube/YoutubeSearchEngineTest.java | 2 +- .../newpipe/extractor/youtube/YoutubeSearchResultTest.java | 2 +- .../extractor/youtube/YoutubeStreamExtractorDefaultTest.java | 2 +- .../extractor/youtube/YoutubeStreamExtractorGemaTest.java | 2 +- .../youtube/YoutubeStreamExtractorLiveStreamTest.java | 4 ++-- .../youtube/YoutubeStreamExtractorRestrictedTest.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeChannelExtractorTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeChannelExtractorTest.java index b47677a16..d4aaf51b9 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeChannelExtractorTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeChannelExtractorTest.java @@ -32,7 +32,7 @@ public class YoutubeChannelExtractorTest extends AndroidTestCase { @Override public void setUp() throws Exception { super.setUp(); - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); extractor = NewPipe.getService("Youtube") .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 0); } diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java index 71e63b7f0..9cd89446d 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java @@ -35,7 +35,7 @@ public class YoutubeSearchEngineTest extends AndroidTestCase { @Override public void setUp() throws Exception { super.setUp(); - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); SearchEngine engine = NewPipe.getService("Youtube").getSearchEngineInstance(); result = engine.search("this is something boring", 0, "de").getSearchResult(); diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchResultTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchResultTest.java index 5d68903cf..8f4a18b37 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchResultTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchResultTest.java @@ -38,7 +38,7 @@ public class YoutubeSearchResultTest extends AndroidTestCase { @Override public void setUp() throws Exception { super.setUp(); - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); SuggestionExtractor engine = new YoutubeSuggestionExtractor(0); suggestionReply = engine.suggestionList("hello", "de"); } diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java index abde32ed7..880f018e2 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java @@ -38,7 +38,7 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase { public void setUp() throws Exception { super.setUp(); - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); extractor = NewPipe.getService("Youtube") .getExtractorInstance("https://www.youtube.com/watch?v=YQHsXMglC9A"); } diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java index 3e6cf8d2c..6f1587c9a 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java @@ -39,7 +39,7 @@ public class YoutubeStreamExtractorGemaTest extends AndroidTestCase { public void testGemaError() throws IOException, ExtractionException { if(testActive) { try { - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); NewPipe.getService("Youtube") .getExtractorInstance("https://www.youtube.com/watch?v=3O1_3zBUKM8"); } catch(YoutubeStreamExtractor.GemaException ge) { diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java index 72fcfd45d..9150ba93f 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java @@ -38,9 +38,9 @@ public class YoutubeStreamExtractorLiveStreamTest extends AndroidTestCase { //todo: make the extractor not throw over a livestream /* - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); extractor = NewPipe.getService("Youtube") - .getExtractorInstance("https://www.youtube.com/watch?v=J0s6NjqdjLE", new Downloader()); + .getExtractorInstance("https://www.youtube.com/watch?v=J0s6NjqdjLE", Downloader.getInstance()); */ } diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java index 092b082c7..1a7195f8c 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java @@ -17,7 +17,7 @@ public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase { public void setUp() throws Exception { super.setUp(); - NewPipe.init(new Downloader()); + NewPipe.init(Downloader.getInstance()); extractor = NewPipe.getService("Youtube") .getExtractorInstance("https://www.youtube.com/watch?v=i6JTvzrpBy0"); }