simplified tests

2 files changed, 33 insertions, 98 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 d4f0d8ca2..4d964b9f9 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.test.FlakyTest;
 import android.test.InstrumentationTestCase;
-import android.util.Log;
 
 import java.io.File;
 import java.io.IOException;
@@ -92,27 +91,8 @@ public class DBCleanupTests extends InstrumentationTestCase {
         List<FeedItem> items = new ArrayList<>();
         feed.setItems(items);
         List<File> files = new ArrayList<>();
-        for (int i = 0; i < NUM_ITEMS; i++) {
-            Date itemDate = new Date(NUM_ITEMS - i);
-            FeedItem item = new FeedItem(0, "title", "id", "link", itemDate, FeedItem.PLAYED, feed);
+        populateItems(NUM_ITEMS, feed, items, files, FeedItem.PLAYED, false, false);
 
-            File f = new File(destFolder, "file " + i);
-            assertTrue(f.createNewFile());
-            files.add(f);
-            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, itemDate, 0));
-            items.add(item);
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        for (FeedItem item : items) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-        }
         DBTasks.performAutoCleanup(context);
         for (int i = 0; i < files.size(); i++) {
             if (i < EPISODE_CACHE_SIZE) {
@@ -123,29 +103,33 @@ public class DBCleanupTests extends InstrumentationTestCase {
         }
     }
 
-    @FlakyTest(tolerance = 3)
-    public void testPerformAutoCleanupHandleUnplayed() throws IOException {
-        final int NUM_ITEMS = EPISODE_CACHE_SIZE * 2;
-
-        Feed feed = new Feed("url", new Date(), "title");
-        List<FeedItem> items = new ArrayList<FeedItem>();
-        feed.setItems(items);
-        List<File> files = new ArrayList<File>();
-        for (int i = 0; i < NUM_ITEMS; i++) {
-            Date itemDate = new Date(NUM_ITEMS - i);
-            FeedItem item = new FeedItem(0, "title", "id", "link", itemDate, FeedItem.UNPLAYED, feed);
+    protected 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;
+            if (itemState == FeedItem.PLAYED) {
+                playbackCompletionDate = itemDate;
+            }
+            FeedItem item = new FeedItem(0, "title", "id", "link", itemDate, itemState, feed);
 
             File f = new File(destFolder, "file " + i);
             assertTrue(f.createNewFile());
-            assertTrue(f.exists());
             files.add(f);
-            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, itemDate, 0));
+            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, playbackCompletionDate, 0));
             items.add(item);
         }
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
         adapter.setCompleteFeed(feed);
+        if (addToQueue) {
+            adapter.setQueue(items);
+        }
+        if (addToFavorites) {
+            adapter.setFavorites(items);
+        }
         adapter.close();
 
         assertTrue(feed.getId() != 0);
@@ -153,6 +137,18 @@ public class DBCleanupTests extends InstrumentationTestCase {
             assertTrue(item.getId() != 0);
             assertTrue(item.getMedia().getId() != 0);
         }
+    }
+
+    @FlakyTest(tolerance = 3)
+    public void testPerformAutoCleanupHandleUnplayed() throws IOException {
+        final int NUM_ITEMS = EPISODE_CACHE_SIZE * 2;
+
+        Feed feed = new Feed("url", new Date(), "title");
+        List<FeedItem> items = new ArrayList<FeedItem>();
+        feed.setItems(items);
+        List<File> files = new ArrayList<File>();
+        populateItems(NUM_ITEMS, feed, items, files, FeedItem.UNPLAYED, false, false);
+
         DBTasks.performAutoCleanup(context);
         for (File file : files) {
             assertTrue(file.exists());
@@ -167,29 +163,8 @@ public class DBCleanupTests extends InstrumentationTestCase {
         List<FeedItem> items = new ArrayList<>();
         feed.setItems(items);
         List<File> files = new ArrayList<>();
-        for (int i = 0; i < NUM_ITEMS; i++) {
-            Date itemDate = new Date(NUM_ITEMS - i);
-            FeedItem item = new FeedItem(0, "title", "id", "link", itemDate, FeedItem.PLAYED, feed);
-
-            File f = new File(destFolder, "file " + i);
-            assertTrue(f.createNewFile());
-            assertTrue(f.exists());
-            files.add(f);
-            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, itemDate, 0));
-            items.add(item);
-        }
+        populateItems(NUM_ITEMS, feed, items, files, FeedItem.PLAYED, true, false);
 
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.setQueue(items);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        for (FeedItem item : items) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-        }
         DBTasks.performAutoCleanup(context);
         for (File file : files) {
             assertTrue(file.exists());
@@ -227,28 +202,8 @@ public class DBCleanupTests extends InstrumentationTestCase {
         List<FeedItem> items = new ArrayList<>();
         feed.setItems(items);
         List<File> files = new ArrayList<>();
-        for (int i = 0; i < NUM_ITEMS; i++) {
-            Date itemDate = new Date(NUM_ITEMS - i);
-            FeedItem item = new FeedItem(0, "title", "id", "link", itemDate, FeedItem.PLAYED, feed);
-            File f = new File(destFolder, "file " + i);
-            assertTrue(f.createNewFile());
-            assertTrue(f.exists());
-            files.add(f);
-            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, itemDate, 0));
-            items.add(item);
-        }
+        populateItems(NUM_ITEMS, feed, items, files, FeedItem.PLAYED, false, true);
 
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.setFavorites(items);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        for (FeedItem item : items) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-        }
         DBTasks.performAutoCleanup(context);
         for (File file : files) {
             assertTrue(file.exists());
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 7e63df159..890897f43 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
@@ -10,10 +10,8 @@ import java.util.List;
 
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBTasks;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
 /**
  * Tests that the APQueueCleanupAlgorithm is working correctly.
@@ -38,26 +36,8 @@ public class DBQueueCleanupAlgorithmTest extends DBCleanupTests {
         List<FeedItem> items = new ArrayList<>();
         feed.setItems(items);
         List<File> files = new ArrayList<>();
-        for (int i = 0; i < NUM_ITEMS; i++) {
-            FeedItem item = new FeedItem(0, "title", "id", "link", new Date(NUM_ITEMS - i), FeedItem.UNPLAYED, feed);
+        populateItems(NUM_ITEMS, feed, items, files, FeedItem.UNPLAYED, false, false);
 
-            File f = new File(destFolder, "file " + i);
-            assertTrue(f.createNewFile());
-            files.add(f);
-            item.setMedia(new FeedMedia(0, item, 1, 0, 1L, "m", f.getAbsolutePath(), "url", true, null, 0));
-            items.add(item);
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        for (FeedItem item : items) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-        }
         DBTasks.performAutoCleanup(context);
         for (int i = 0; i < files.size(); i++) {
             if (i < EPISODE_CACHE_SIZE) {