From bbc994fc9bf4e066e80af624ee4329f95ac8db4b Mon Sep 17 00:00:00 2001 From: Nathan Mascitelli Date: Fri, 7 Feb 2020 10:55:14 -0500 Subject: Fix build and tests --- .../de/test/antennapod/service/download/DownloadServiceTest.java | 5 ++--- .../java/de/test/antennapod/service/download/HttpDownloaderTest.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'app/src') diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java index 229d4b307..86112fbe2 100644 --- a/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java +++ b/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java @@ -120,8 +120,7 @@ public class DownloadServiceTest { assertFalse("The media in test should not yet been downloaded", DBReader.getFeedMedia(testMedia11.getId()).isDownloaded()); - DownloadRequester.getInstance().downloadMedia(false, InstrumentationRegistry.getTargetContext(), - testMedia11.getItem()); + DownloadRequester.getInstance().downloadMedia(false, InstrumentationRegistry.getTargetContext(), false, testMedia11.getItem()); Awaitility.await() .atMost(5000, TimeUnit.MILLISECONDS) .until(() -> feedItemEventListener.getEvents().size() >= numEventsExpected); @@ -166,7 +165,7 @@ public class DownloadServiceTest { } withFeedItemEventListener(feedItemEventListener -> { - DownloadRequester.getInstance().downloadMedia(false, context, testMedia11.getItem()); + DownloadRequester.getInstance().downloadMedia(false, context, false, testMedia11.getItem()); withDownloadEventListener(downloadEventListener -> Awaitility.await("download is actually running") .atMost(5000, TimeUnit.MILLISECONDS) diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java index 7d9ec7c98..96fa641c6 100644 --- a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java +++ b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java @@ -77,7 +77,7 @@ public class HttpDownloaderTest { private Downloader download(String url, String title, boolean expectedResult, boolean deleteExisting, String username, String password, boolean deleteOnFail) { FeedFile feedFile = setupFeedFile(url, title, deleteExisting); - DownloadRequest request = new DownloadRequest(feedFile.getFile_url(), url, title, 0, feedFile.getTypeAsInt(), username, password, deleteOnFail, null); + DownloadRequest request = new DownloadRequest(feedFile.getFile_url(), url, title, 0, feedFile.getTypeAsInt(), username, password, deleteOnFail, null, false); Downloader downloader = new HttpDownloader(request); downloader.call(); DownloadStatus status = downloader.getResult(); @@ -113,7 +113,7 @@ public class HttpDownloaderTest { public void testCancel() { final String url = httpServer.getBaseUrl() + "/delay/3"; FeedFileImpl feedFile = setupFeedFile(url, "delay", true); - final Downloader downloader = new HttpDownloader(new DownloadRequest(feedFile.getFile_url(), url, "delay", 0, feedFile.getTypeAsInt())); + final Downloader downloader = new HttpDownloader(new DownloadRequest(feedFile.getFile_url(), url, "delay", 0, feedFile.getTypeAsInt(), false)); Thread t = new Thread() { @Override public void run() { -- cgit v1.2.3