From 77c3ec0bbe91cc09fad1e48618cba3ff5d52b53a Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 26 Nov 2014 14:19:08 +0100 Subject: [PATCH] support for single quotes (#681) --- .../java/com/commafeed/backend/feed/FeedUtils.java | 4 ++-- .../com/commafeed/backend/feed/FeedUtilsTest.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/src/main/java/com/commafeed/backend/feed/FeedUtils.java index 4ce026bc..88e0daad 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedUtils.java +++ b/src/main/java/com/commafeed/backend/feed/FeedUtils.java @@ -185,12 +185,12 @@ public class FeedUtils { } String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1)); - index = StringUtils.indexOf(pi, "encoding=\""); + index = StringUtils.indexOf(pi, "encoding="); if (index == -1) { return null; } String encoding = pi.substring(index + 10, pi.length()); - encoding = encoding.substring(0, encoding.indexOf('"')); + encoding = encoding.substring(0, Math.max(encoding.indexOf(' ') - 1, 0)); return encoding; } diff --git a/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java b/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java index 488b90c3..f333ca4e 100644 --- a/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java +++ b/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java @@ -3,8 +3,6 @@ package com.commafeed.backend.feed; import org.junit.Assert; import org.junit.Test; -import com.commafeed.backend.feed.FeedUtils; - public class FeedUtilsTest { @Test @@ -55,4 +53,13 @@ public class FeedUtilsTest { FeedUtils.toAbsoluteUrl("elisp_all_about_lines.html", "blog.xml", "http://ergoemacs.org/emacs/blog.xml")); } + + @Test + public void testExtractDeclaredEncoding() { + Assert.assertNull(FeedUtils.extractDeclaredEncoding("".getBytes())); + Assert.assertNull(FeedUtils.extractDeclaredEncoding("".getBytes())); + Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("".getBytes())); + Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("".getBytes())); + + } }