garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

remove www from normalized url

Browse Source
This commit is contained in:
Athou
2013-07-03 10:19:22 +02:00
parent bbe9720e63
commit e2f1774e1d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -104,6 +104,7 @@ public class FeedUtils {
if (normalized.startsWith("https")) { if (normalized.startsWith("https")) {
normalized = "http" + normalized.substring(5); normalized = "http" + normalized.substring(5);
} }
normalized = normalized.replace("//www.", "//");
normalized = normalized.replace("feeds2.feedburner.com", "feeds.feedburner.com"); normalized = normalized.replace("feeds2.feedburner.com", "feeds.feedburner.com");
return normalized; return normalized;
} }

8
src/test/java/com/commafeed/backend/feeds/FeedUtilsTest.java
View File

@@ -8,9 +8,10 @@ public class FeedUtilsTest {
@Test @Test
public void testNormalization() { public void testNormalization() {
String urla1 = "http://example.com/hello?a=1&b=2"; String urla1 = "http://example.com/hello?a=1&b=2";
String urla2 = "http://EXAmPLe.com/HELLo?a=1&b=2"; String urla2 = "http://www.example.com/hello?a=1&b=2";
String urla3 = "http://example.com/hello?b=2&a=1"; String urla3 = "http://EXAmPLe.com/HELLo?a=1&b=2";
String urla4 = "https://example.com/hello?a=1&b=2"; String urla4 = "http://example.com/hello?b=2&a=1";
String urla5 = "https://example.com/hello?a=1&b=2";
String urlb1 = "http://ftr.fivefilters.org/makefulltextfeed.php?url=http%3A%2F%2Ffeeds.howtogeek.com%2FHowToGeek&max=10&summary=1"; String urlb1 = "http://ftr.fivefilters.org/makefulltextfeed.php?url=http%3A%2F%2Ffeeds.howtogeek.com%2FHowToGeek&max=10&summary=1";
String urlb2 = "http://ftr.fivefilters.org/makefulltextfeed.php?url=http://feeds.howtogeek.com/HowToGeek&max=10&summary=1"; String urlb2 = "http://ftr.fivefilters.org/makefulltextfeed.php?url=http://feeds.howtogeek.com/HowToGeek&max=10&summary=1";
@@ -21,6 +22,7 @@ public class FeedUtilsTest {
Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla2)); Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla2));
Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla3)); Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla3));
Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla4)); Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla4));
Assert.assertEquals(FeedUtils.normalizeURL(urla1), FeedUtils.normalizeURL(urla5));
Assert.assertEquals(FeedUtils.normalizeURL(urlb1), FeedUtils.normalizeURL(urlb2)); Assert.assertEquals(FeedUtils.normalizeURL(urlb1), FeedUtils.normalizeURL(urlb2));