Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a style issue and fix the test

Browse Source
This commit is contained in:
Petar Kukolj 2019-01-03 22:50:30 +01:00
parent c327fd75ee
commit ebc0200968
2 changed files with 6 additions and 3 deletions
app/src/androidTest/java/de/test/antennapod/storage
DBWriterTest.java
core/src/main/java/de/danoeh/antennapod/core/storage
DBWriter.java

6
app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java

@ -132,6 +132,8 @@ public class DBWriterTest extends InstrumentationTestCase {
public void testDeleteFeedMediaOfItemRemoveFromQueue() public void testDeleteFeedMediaOfItemRemoveFromQueue()
throws IOException, ExecutionException, InterruptedException, TimeoutException { throws IOException, ExecutionException, InterruptedException, TimeoutException {
assertTrue(UserPreferences.shouldDeleteRemoveFromQueue());
File dest = new File(getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER), "testFile"); File dest = new File(getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER), "testFile");
assertTrue(dest.createNewFile()); assertTrue(dest.createNewFile());
@ -158,8 +160,8 @@ public class DBWriterTest extends InstrumentationTestCase {
queue = DBReader.getQueue(); queue = DBReader.getQueue();
assertTrue(queue.size() != 0); assertTrue(queue.size() != 0);
DBWriter.deleteFeedMediaOfItem(getInstrumentation().getTargetContext(), media.getId()) DBWriter.deleteFeedMediaOfItem(getInstrumentation().getTargetContext(), media.getId());
.get(TIMEOUT, TimeUnit.SECONDS); Thread.sleep(200);
media = DBReader.getFeedMedia(media.getId()); media = DBReader.getFeedMedia(media.getId());
assertNotNull(media); assertNotNull(media);
assertFalse(dest.exists()); assertFalse(dest.exists());

3
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, public static Future<?> deleteFeedMediaOfItem(final Context context,
final long mediaId) { final long mediaId) {
Future res = doDeleteFeedMediaOfItem(context, mediaId);
if (UserPreferences.shouldDeleteRemoveFromQueue()) { if (UserPreferences.shouldDeleteRemoveFromQueue()) {
DBWriter.removeQueueItem(context, DBReader.getFeedMedia(mediaId).getItem(), false); DBWriter.removeQueueItem(context, DBReader.getFeedMedia(mediaId).getItem(), false);
} }
return doDeleteFeedMediaOfItem(context, mediaId); return res;
} }
/** /**