Merge branch 'master' into develop

2 files changed, 50 insertions, 0 deletions

diff --git a/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java b/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java
index 2acc73204..36ca7f0d8 100644
--- a/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/syndication/handler/AtomParserTest.java
@@ -14,6 +14,7 @@ import de.danoeh.antennapod.model.feed.FeedMedia;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 /**
  * Tests for Atom feeds in FeedHandler.
@@ -55,6 +56,34 @@ public class AtomParserTest {
     }
 
     @Test
+    public void testEmptyRelLinks() throws Exception {
+        File feedFile = FeedParserTestHelper.getFeedFile("feed-atom-testEmptyRelLinks.xml");
+        Feed feed = FeedParserTestHelper.runFeedParser(feedFile);
+        assertEquals(Feed.TYPE_ATOM1, feed.getType());
+        assertEquals("title", feed.getTitle());
+        assertEquals("http://example.com/feed", feed.getFeedIdentifier());
+        assertEquals("http://example.com", feed.getLink());
+        assertEquals("This is the description", feed.getDescription());
+        assertNull(feed.getPaymentLinks());
+        assertEquals("http://example.com/picture", feed.getImageUrl());
+        assertEquals(1, feed.getItems().size());
+
+        // feed entry
+        FeedItem item = feed.getItems().get(0);
+        assertEquals("http://example.com/item-0", item.getItemIdentifier());
+        assertEquals("item-0", item.getTitle());
+        assertNull(item.getDescription());
+        assertEquals("http://example.com/items/0", item.getLink());
+        assertEquals(new Date(0), item.getPubDate());
+        assertNull(item.getPaymentLink());
+        assertEquals("http://example.com/picture", item.getImageLocation());
+        // media
+        assertFalse(item.hasMedia());
+        // chapters
+        assertNull(item.getChapters());
+    }
+
+    @Test
     public void testLogoWithWhitespace() throws Exception {
         File feedFile = FeedParserTestHelper.getFeedFile("feed-atom-testLogoWithWhitespace.xml");
         Feed feed = FeedParserTestHelper.runFeedParser(feedFile);
diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
index 5e2e46e74..fe3a3c05b 100644
--- a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
@@ -185,4 +185,25 @@ public class ChapterReaderTest {
         assertEquals(EmbeddedChapterImage.makeUrl(5330, 4015), chapters.get(0).getImageUrl());
         assertEquals(EmbeddedChapterImage.makeUrl(9498, 4364), chapters.get(1).getImageUrl());
     }
+
+    @Test
+    public void testRealFileMp3chapsPy() throws IOException, ID3ReaderException {
+        CountingInputStream inputStream = new CountingInputStream(getClass().getClassLoader()
+                .getResource("media-parser/mp3chaps-py.mp3").openStream());
+        ChapterReader reader = new ChapterReader(inputStream);
+        reader.readInputStream();
+        List<Chapter> chapters = reader.getChapters();
+
+        assertEquals(4, chapters.size());
+
+        assertEquals(0, chapters.get(0).getStart());
+        assertEquals(7000, chapters.get(1).getStart());
+        assertEquals(9000, chapters.get(2).getStart());
+        assertEquals(11000, chapters.get(3).getStart());
+
+        assertEquals("Start", chapters.get(0).getTitle());
+        assertEquals("Chapter 1", chapters.get(1).getTitle());
+        assertEquals("Chapter 2", chapters.get(2).getTitle());
+        assertEquals("Chapter 3", chapters.get(3).getTitle());
+    }
 }