Repository: roller Updated Branches: refs/heads/bootstrap-ui 5c74873f7 -> ff5ba855b
Ignore some tests that depend on http://rollerweblogger.org having good SSL certs; apparently LetsEncrypt certs are not up to snuff. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/94cb2602 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/94cb2602 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/94cb2602 Branch: refs/heads/bootstrap-ui Commit: 94cb26026dd3cda600b000e3c93c48a1e7c4d605 Parents: 25a9bc7 Author: Dave Johnson <[email protected]> Authored: Mon Nov 27 18:18:58 2017 -0500 Committer: Dave Johnson <[email protected]> Committed: Mon Nov 27 18:18:58 2017 -0500 ---------------------------------------------------------------------- .../apache/roller/planet/business/RomeFeedFetcherTest.java | 8 +++++--- .../planet/business/SingleThreadedFeedUpdaterTest.java | 4 +++- .../apache/roller/weblogger/util/LinkbackExtractorTest.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/94cb2602/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java index 4cf3b24..b70c3f1 100644 --- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java @@ -26,16 +26,18 @@ import org.apache.roller.planet.business.fetcher.FeedFetcher; import org.apache.roller.planet.business.fetcher.FetcherException; import org.apache.roller.planet.pojos.Subscription; import org.apache.roller.weblogger.business.WebloggerFactory; +import org.junit.Ignore; /** * Test database implementation of PlanetManager. */ +@Ignore("Until rollerweblogger.org sorts out SSL issues") public class RomeFeedFetcherTest extends TestCase { public static Log log = LogFactory.getLog(RomeFeedFetcherTest.class); - String feed_url = "http://rollerweblogger.org/roller/feed/entries/atom";; + String feed_url = "https://rollerweblogger.org/roller/feed/entries/atom";; protected void setUp() throws Exception { @@ -56,7 +58,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); @@ -76,7 +78,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); http://git-wip-us.apache.org/repos/asf/roller/blob/94cb2602/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java index 46298c5..4015845 100644 --- a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java @@ -24,11 +24,13 @@ import org.apache.roller.planet.business.updater.SingleThreadedFeedUpdater; import org.apache.roller.planet.pojos.Subscription; import org.apache.roller.weblogger.TestUtils; import org.apache.roller.weblogger.business.WebloggerFactory; +import org.junit.Ignore; /** * Test feed updater. */ +@Ignore("Until rollerweblogger.org sorts out SSL issues") public class SingleThreadedFeedUpdaterTest extends TestCase { public static Log log = LogFactory.getLog(SingleThreadedFeedUpdaterTest.class); @@ -71,7 +73,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase { sub = mgr.getSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); http://git-wip-us.apache.org/repos/asf/roller/blob/94cb2602/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java b/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java index 0361c2c..a8bda59 100644 --- a/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java @@ -21,10 +21,12 @@ package org.apache.roller.weblogger.util; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.junit.Ignore; /** * Test linkback extractor. */ +@Ignore("Until rollerweblogger.org sorts out SSL issues") public class LinkbackExtractorTest extends TestCase { /** @@ -58,11 +60,11 @@ public class LinkbackExtractorTest extends TestCase { // Second URL contains a link to the first { "http://cassandra.apache.org/";, - "http://rollerweblogger.org/roller/entry/composite_keys_in_cassandra"; + "https://rollerweblogger.org/roller/entry/composite_keys_in_cassandra"; }, { "http://roller.apache.org/downloads/downloads.html";, - "http://rollerweblogger.org/project/date/20140627"; + "https://rollerweblogger.org/project/date/20140627"; } };
