Merge pull request #1213 from TomHennen/favorites

Favorites

4 files changed, 7 insertions, 7 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index 869a13127..201ce17c0 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.feed.QueueEvent;
+import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.service.playback.PlaybackServiceTaskManager;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.danoeh.antennapod.core.util.playback.Playable;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
index 6873cb9a6..3988669ce 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
@@ -102,7 +102,7 @@ public class DBReaderTest extends InstrumentationTestCase {
                 items.add(item);
             }
         }
-        DBReader.loadFeedDataOfFeedItemlist(items);
+        DBReader.loadAdditionalFeedItemListData(items);
         for (int i = 0; i < numFeeds; i++) {
             for (int j = 0; j < numItems; j++) {
                 FeedItem item = feeds.get(i).getItems().get(j);
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 2a63ef4b3..585e27e0b 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
@@ -556,7 +556,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         }
         List<Future<?>> futures = new ArrayList<Future<?>>();
         for (FeedItem item : feed.getItems()) {
-            futures.add(DBWriter.addQueueItem(context, item.getId()));
+            futures.add(DBWriter.addQueueItem(context, item));
         }
         for (Future<?> f : futures) {
             f.get(TIMEOUT, TimeUnit.SECONDS);
@@ -577,7 +577,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(item.getId() != 0);
-        DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
+        DBWriter.addQueueItem(context, item).get(TIMEOUT, TimeUnit.SECONDS);
 
         adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -601,7 +601,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(item.getId() != 0);
-        DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
+        DBWriter.addQueueItem(context, item).get(TIMEOUT, TimeUnit.SECONDS);
 
         adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -611,7 +611,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         cursor.close();
         adapter.close();
 
-        DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
+        DBWriter.addQueueItem(context, item).get(TIMEOUT, TimeUnit.SECONDS);
         adapter = PodDBAdapter.getInstance();
         adapter.open();
         cursor = adapter.getQueueIDCursor();
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index 9859e7534..973426841 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -26,7 +26,7 @@ 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.QueueEvent;
+import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.greenrobot.event.EventBus;
 import de.test.antennapod.util.service.download.HTTPBin;