From 7ef865506f08a309894d3e05a9a76005c6d20f98 Mon Sep 17 00:00:00 2001 From: Athou Date: Fri, 15 Dec 2023 18:05:48 +0100 Subject: [PATCH] use non-existing urls --- .../src/test/java/com/commafeed/integration/FeedIT.java | 2 +- .../test/java/com/commafeed/integration/NextUnreadIT.java | 2 +- commafeed-server/src/test/resources/feed/rss.xml | 6 +++--- commafeed-server/src/test/resources/opml/opml_noversion.xml | 3 ++- commafeed-server/src/test/resources/opml/opml_v1.0.xml | 3 ++- commafeed-server/src/test/resources/opml/opml_v1.1.xml | 3 ++- commafeed-server/src/test/resources/opml/opml_v2.0.xml | 3 ++- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java b/commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java index 877b0248..5687b4d3 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java @@ -209,7 +209,7 @@ class FeedIT extends BaseIT { String expextedOpml = "\n" + "\n" + " \n" + " admin subscriptions in CommaFeed\n" + " \n" + " \n" + " \n" - + " \n" + + " \n" + " \n" + " \n" + "\n"; Assertions.assertEquals(StringUtils.normalizeSpace(expextedOpml), StringUtils.normalizeSpace(opml)); } diff --git a/commafeed-server/src/test/java/com/commafeed/integration/NextUnreadIT.java b/commafeed-server/src/test/java/com/commafeed/integration/NextUnreadIT.java index 8d76f576..1830879a 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/NextUnreadIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/NextUnreadIT.java @@ -25,7 +25,7 @@ class NextUnreadIT extends BaseIT { .header(HttpHeaders.COOKIE, "JSESSIONID=" + cookie) .get(); Assertions.assertEquals(HttpStatus.FOUND_302, response.getStatus()); - Assertions.assertEquals("https://www.commafeed.com/2", response.getHeaderString(HttpHeaders.LOCATION)); + Assertions.assertEquals("https://hostname.local/commafeed/2", response.getHeaderString(HttpHeaders.LOCATION)); } } diff --git a/commafeed-server/src/test/resources/feed/rss.xml b/commafeed-server/src/test/resources/feed/rss.xml index 0c3919c9..4efd411d 100644 --- a/commafeed-server/src/test/resources/feed/rss.xml +++ b/commafeed-server/src/test/resources/feed/rss.xml @@ -2,16 +2,16 @@ CommaFeed test feed - https://www.commafeed.com + https://hostname.local/commafeed CommaFeed test feed description Item 1 - https://www.commafeed.com/1 + https://hostname.local/commafeed/1 Item 1 description Item 2 - https://www.commafeed.com/2 + https://hostname.local/commafeed/2 Item 2 description diff --git a/commafeed-server/src/test/resources/opml/opml_noversion.xml b/commafeed-server/src/test/resources/opml/opml_noversion.xml index 4bcdbe0e..e0d47d44 100644 --- a/commafeed-server/src/test/resources/opml/opml_noversion.xml +++ b/commafeed-server/src/test/resources/opml/opml_noversion.xml @@ -5,7 +5,8 @@ - + diff --git a/commafeed-server/src/test/resources/opml/opml_v1.0.xml b/commafeed-server/src/test/resources/opml/opml_v1.0.xml index 61ac899e..b4754439 100644 --- a/commafeed-server/src/test/resources/opml/opml_v1.0.xml +++ b/commafeed-server/src/test/resources/opml/opml_v1.0.xml @@ -5,7 +5,8 @@ - + diff --git a/commafeed-server/src/test/resources/opml/opml_v1.1.xml b/commafeed-server/src/test/resources/opml/opml_v1.1.xml index 4e2bedea..f3e94135 100644 --- a/commafeed-server/src/test/resources/opml/opml_v1.1.xml +++ b/commafeed-server/src/test/resources/opml/opml_v1.1.xml @@ -5,7 +5,8 @@ - + diff --git a/commafeed-server/src/test/resources/opml/opml_v2.0.xml b/commafeed-server/src/test/resources/opml/opml_v2.0.xml index 29c70d83..c8f9a7f9 100644 --- a/commafeed-server/src/test/resources/opml/opml_v2.0.xml +++ b/commafeed-server/src/test/resources/opml/opml_v2.0.xml @@ -5,7 +5,8 @@ - +