Skip feed fetcher tests on Java 1.7 which does not support TLS 1.2.
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 0f5e9e5..d01c4dc 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
@@ -16,15 +16,13 @@
package org.apache.roller.planet.business;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.TestUtils;
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.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -46,9 +44,23 @@
protected void tearDown() throws Exception {
}
-
-
+
+ static boolean shouldSkip() {
+
+ if (System.getProperty("java.version").startsWith("1.7")) {
+ log.warn("Skipping testFetchFeed because free-of-charge versions of " +
+ "Java 1.7 do not support TLS 1.2 which is now in common usage.");
+ return true;
+ }
+ return false;
+ }
+
public void testFetchFeed() throws FetcherException {
+
+ if (shouldSkip()) {
+ return;
+ }
+
try {
FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
@@ -69,6 +81,11 @@
public void testFetchFeedConditionally() throws FetcherException {
+
+ if (shouldSkip()) {
+ return;
+ }
+
try {
FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
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 4c03c4b..860dafd 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
@@ -39,6 +39,7 @@
protected void setUp() throws Exception {
+
// setup planet
TestUtils.setupWeblogger();
@@ -58,7 +59,11 @@
public void testUpdateSubscription() throws Exception {
-
+
+ if (RomeFeedFetcherTest.shouldSkip()) {
+ return;
+ }
+
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(testSub.getId());
