From ee99ef934c131e5c75682c47129dd172a2203793 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 2 Mar 2024 09:50:24 +0100 Subject: Remove FeedComponent and FeedFile class (#6949) We want to be more flexible in what we store for each type of item. Also rename misleading function (lastUpdate to lastModified) --- .../test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java | 5 ++++- .../antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java | 3 +-- .../danoeh/antennapod/core/storage/mapper/FeedCursorMapperTest.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'core/src/test/java') diff --git a/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java index b67bc48ea..e045012a6 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java @@ -423,7 +423,10 @@ public class DbReaderTest { FeedItem item2 = DBReader.getFeedItem(item1.getId()); item2.setChapters(DBReader.loadChaptersOfFeedItem(item2)); assertTrue(item2.hasChapters()); - assertEquals(item1.getChapters(), item2.getChapters()); + assertEquals(item1.getChapters().size(), item2.getChapters().size()); + for (int i = 0; i < item1.getChapters().size(); i++) { + assertEquals(item1.getChapters().get(i).getId(), item2.getChapters().get(i).getId()); + } } @Test diff --git a/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java b/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java index 2594fabf6..f0f81eee1 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java @@ -16,7 +16,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import de.danoeh.antennapod.model.feed.FeedComponent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.core.feed.FeedMother; @@ -145,7 +144,7 @@ public class ItemEnqueuePositionCalculatorTest { Collections.unmodifiableList(Arrays.asList( createFeedItem(11), createFeedItem(12), createFeedItem(13), createFeedItem(14))); static final List QUEUE_DEFAULT_IDS = - QUEUE_DEFAULT.stream().map(FeedComponent::getId).collect(Collectors.toList()); + QUEUE_DEFAULT.stream().map(FeedItem::getId).collect(Collectors.toList()); static Playable getCurrentlyPlaying(long idCurrentlyPlaying) { diff --git a/core/src/test/java/de/danoeh/antennapod/core/storage/mapper/FeedCursorMapperTest.java b/core/src/test/java/de/danoeh/antennapod/core/storage/mapper/FeedCursorMapperTest.java index 486aa82a8..f41762672 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/storage/mapper/FeedCursorMapperTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/storage/mapper/FeedCursorMapperTest.java @@ -56,7 +56,7 @@ public class FeedCursorMapperTest { assertEquals("feed file url", feed.getFile_url()); assertEquals("feed download url", feed.getDownload_url()); assertTrue(feed.isDownloaded()); - assertEquals("feed last update", feed.getLastUpdate()); + assertEquals("feed last update", feed.getLastModified()); assertEquals("feed type", feed.getType()); assertEquals("feed identifier", feed.getFeedIdentifier()); assertTrue(feed.isPaged()); -- cgit v1.2.3