Merge branch 'develop'

5 files changed, 18 insertions, 194 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
index 09533208f..5cd4e9906 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
@@ -27,12 +27,12 @@ import static de.test.antennapod.storage.DBTestUtils.saveFeedlist;
 public class DBCleanupTests extends InstrumentationTestCase {
 
     private static final String TAG = "DBTasksTest";
-    protected static final int EPISODE_CACHE_SIZE = 5;
+    static final int EPISODE_CACHE_SIZE = 5;
     private final int cleanupAlgorithm;
 
-    protected Context context;
+    Context context;
 
-    protected File destFolder;
+    private File destFolder;
 
     public DBCleanupTests() {
         this.cleanupAlgorithm = UserPreferences.EPISODE_CLEANUP_DEFAULT;
@@ -104,9 +104,9 @@ public class DBCleanupTests extends InstrumentationTestCase {
         }
     }
 
-    protected void populateItems(final int numItems, Feed feed, List<FeedItem> items,
-                                 List<File> files, int itemState, boolean addToQueue,
-                                 boolean addToFavorites) throws IOException {
+    void populateItems(final int numItems, Feed feed, List<FeedItem> items,
+                       List<File> files, int itemState, boolean addToQueue,
+                       boolean addToFavorites) throws IOException {
         for (int i = 0; i < numItems; i++) {
             Date itemDate = new Date(numItems - i);
             Date playbackCompletionDate = null;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
index 3bd508eaf..d602d150b 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
@@ -5,7 +5,6 @@ import android.test.FlakyTest;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import de.danoeh.antennapod.core.feed.Feed;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
index 13cf56ff4..93a9408b7 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
@@ -18,6 +18,8 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
+import static java.util.Collections.singletonList;
+
 /**
  * Test class for DBTasks
  */
@@ -125,7 +127,7 @@ public class DBTasksTest extends InstrumentationTestCase {
     public void testUpdateFeedMediaUrlResetState() {
         final Feed feed = new Feed("url", null, "title");
         FeedItem item = new FeedItem(0, "item", "id", "link", new Date(), FeedItem.PLAYED, feed);
-        feed.setItems(Arrays.asList(item));
+        feed.setItems(singletonList(item));
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -138,7 +140,7 @@ public class DBTasksTest extends InstrumentationTestCase {
 
         FeedMedia media = new FeedMedia(item, "url", 1024, "mime/type");
         item.setMedia(media);
-        feed.setItems(Arrays.asList(item));
+        feed.setItems(singletonList(item));
 
         final Feed newFeed = DBTasks.updateFeed(context, feed)[0];
         assertTrue(feed != newFeed);
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
index 30f465784..a577e5e36 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
@@ -19,7 +19,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 /**
  * Utility methods for DB* tests.
  */
-public class DBTestUtils {
+class DBTestUtils {
 
     private DBTestUtils(){}
     /**
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 7095d50b1..387ab91b3 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
@@ -15,9 +15,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.SimpleChapter;
@@ -124,89 +122,13 @@ public class DBWriterTest extends InstrumentationTestCase {
         assertNull(media.getFile_url());
     }
 
-    public void testDeleteFeed() throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    public void testDeleteFeed() throws ExecutionException, InterruptedException, IOException, TimeoutException {
         File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
         assertNotNull(destFolder);
 
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
-
-        List<File> itemFiles = new ArrayList<>();
-        // create items with downloaded media files
-        for (int i = 0; i < 10; i++) {
-            FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed, true);
-            feed.getItems().add(item);
-
-            File enc = new File(destFolder, "file " + i);
-            assertTrue(enc.createNewFile());
-            itemFiles.add(enc);
-
-            FeedMedia media = new FeedMedia(0, item, 1, 1, 1, "mime_type", enc.getAbsolutePath(), "download_url", true, null, 0, 0);
-            item.setMedia(media);
-
-            item.setChapters(new ArrayList<Chapter>());
-            item.getChapters().add(new SimpleChapter(0, "item " + i, item, "example.com"));
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
-        for (FeedItem item : feed.getItems()) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-            assertTrue(item.getChapters().get(0).getId() != 0);
-        }
-
-        DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
-
-        // check if files still exist
-        assertFalse(imgFile.exists());
-        for (File f : itemFiles) {
-            assertFalse(f.exists());
-        }
-
-        adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        Cursor c = adapter.getFeedCursor(feed.getId());
-        assertEquals(0, c.getCount());
-        c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertEquals(0, c.getCount());
-        c.close();
-        for (FeedItem item : feed.getItems()) {
-            c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
-            assertEquals(0, c.getCount());
-            c.close();
-            c = adapter.getSingleFeedMediaCursor(item.getMedia().getId());
-            assertEquals(0, c.getCount());
-            c.close();
-            c = adapter.getSimpleChaptersOfFeedItemCursor(item);
-            assertEquals(0, c.getCount());
-            c.close();
-        }
-        adapter.close();
-    }
-
-    public void testDeleteFeedNoImage() throws ExecutionException, InterruptedException, IOException, TimeoutException {
-        File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
-        assertNotNull(destFolder);
-
-        Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<>());
-
-        feed.setImage(null);
-
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
         for (int i = 0; i < 10; i++) {
@@ -261,13 +183,7 @@ public class DBWriterTest extends InstrumentationTestCase {
 
         Feed feed = new Feed("url", null, "title");
         feed.setItems(null);
-
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -275,21 +191,14 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
 
         DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
 
-        // check if files still exist
-        assertFalse(imgFile.exists());
-
         adapter = PodDBAdapter.getInstance();
         adapter.open();
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         adapter.close();
     }
 
@@ -300,12 +209,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         // create items
         for (int i = 0; i < 10; i++) {
@@ -320,24 +224,18 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
         }
 
         DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
 
-        // check if files still exist
-        assertFalse(imgFile.exists());
 
         adapter = PodDBAdapter.getInstance();
         adapter.open();
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -346,65 +244,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
     }
 
-    public void testDeleteFeedWithItemImages() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
-        assertNotNull(destFolder);
-
-        Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<>());
-
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
-
-        // create items with images
-        for (int i = 0; i < 10; i++) {
-            FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed);
-            feed.getItems().add(item);
-            File itemImageFile = new File(destFolder, "item-image-" + i);
-            FeedImage itemImage = new FeedImage(0, "item-image" + i, itemImageFile.getAbsolutePath(), "url", true);
-            item.setImage(itemImage);
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
-        for (FeedItem item : feed.getItems()) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getImage().getId() != 0);
-        }
-
-        DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
-
-        // check if files still exist
-        assertFalse(imgFile.exists());
-
-        adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        Cursor c = adapter.getFeedCursor(feed.getId());
-        assertTrue(c.getCount() == 0);
-        c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
-        for (FeedItem item : feed.getItems()) {
-            c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
-            assertTrue(c.getCount() == 0);
-            c.close();
-            c = adapter.getImageCursor(String.valueOf(item.getImage().getId()));
-            assertEquals(0, c.getCount());
-            c.close();
-        }
-        adapter.close();
-    }
-
     public void testDeleteFeedWithQueueItems() throws ExecutionException, InterruptedException, TimeoutException {
         File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
         assertNotNull(destFolder);
@@ -412,11 +251,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
@@ -437,7 +272,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
             assertTrue(item.getMedia().getId() != 0);
@@ -460,9 +294,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -484,11 +315,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
@@ -509,7 +336,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
             assertTrue(item.getMedia().getId() != 0);
@@ -522,9 +348,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -539,7 +362,7 @@ public class DBWriterTest extends InstrumentationTestCase {
     private FeedMedia playbackHistorySetup(Date playbackCompletionDate) {
         final Context context = getInstrumentation().getTargetContext();
         Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<FeedItem>());
+        feed.setItems(new ArrayList<>());
         FeedItem item = new FeedItem(0, "title", "id", "link", new Date(), FeedItem.PLAYED, feed);
         FeedMedia media = new FeedMedia(0, item, 10, 0, 1, "mime", null, "url", false, playbackCompletionDate, 0, 0);
         feed.getItems().add(item);
@@ -791,7 +614,7 @@ public class DBWriterTest extends InstrumentationTestCase {
     public void testMarkFeedRead() throws InterruptedException, ExecutionException, TimeoutException {
         final int NUM_ITEMS = 10;
         Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<FeedItem>());
+        feed.setItems(new ArrayList<>());
         for (int i = 0; i < NUM_ITEMS; i++) {
             FeedItem item = new FeedItem(0, "title " + i, "id " + i, "link " + i, new Date(), FeedItem.UNPLAYED, feed);
             feed.getItems().add(item);