From ebc02009682d8ad0c724ed3f6d13f97e6668b622 Mon Sep 17 00:00:00 2001 From: Petar Kukolj Date: Thu, 3 Jan 2019 22:50:30 +0100 Subject: [PATCH] Fix a style issue and fix the test --- .../java/de/test/antennapod/storage/DBWriterTest.java | 6 ++++-- .../java/de/danoeh/antennapod/core/storage/DBWriter.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java index 439b616fa..aae2583de 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java @@ -132,6 +132,8 @@ public class DBWriterTest extends InstrumentationTestCase { public void testDeleteFeedMediaOfItemRemoveFromQueue() throws IOException, ExecutionException, InterruptedException, TimeoutException { + assertTrue(UserPreferences.shouldDeleteRemoveFromQueue()); + File dest = new File(getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER), "testFile"); assertTrue(dest.createNewFile()); @@ -158,8 +160,8 @@ public class DBWriterTest extends InstrumentationTestCase { queue = DBReader.getQueue(); assertTrue(queue.size() != 0); - DBWriter.deleteFeedMediaOfItem(getInstrumentation().getTargetContext(), media.getId()) - .get(TIMEOUT, TimeUnit.SECONDS); + DBWriter.deleteFeedMediaOfItem(getInstrumentation().getTargetContext(), media.getId()); + Thread.sleep(200); media = DBReader.getFeedMedia(media.getId()); assertNotNull(media); assertFalse(dest.exists()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index 23ed04866..93f51d63c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -138,10 +138,11 @@ public class DBWriter { */ public static Future deleteFeedMediaOfItem(final Context context, final long mediaId) { + Future res = doDeleteFeedMediaOfItem(context, mediaId); if (UserPreferences.shouldDeleteRemoveFromQueue()) { DBWriter.removeQueueItem(context, DBReader.getFeedMedia(mediaId).getItem(), false); } - return doDeleteFeedMediaOfItem(context, mediaId); + return res; } /**