[java-identity-provider] branch master updated: JSPT-76 - centralise detection of Java runtime version
Ian Young
ian at iay.org.uk
Fri Nov 10 08:44:20 EST 2017
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1fd0b8262aa394e504fa01acc470d7be2d2f3ad4
The following commit(s) were added to refs/heads/master by this push:
new 1fd0b82 JSPT-76 - centralise detection of Java runtime version
1fd0b82 is described below
commit 1fd0b8262aa394e504fa01acc470d7be2d2f3ad4
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Nov 10 13:44:10 2017 +0000
JSPT-76 - centralise detection of Java runtime version
---
.../filter/matcher/impl/ScriptedMatcherTest.java | 8 ++----
.../filter/spring/basic/ScriptedTest.java | 8 ++----
.../resolver/ad/impl/ScriptedAttributeTest.java | 12 +++------
.../dc/http/impl/HTTPDataConnectorTest.java | 22 +++++++---------
.../dc/impl/ScriptedDataConnectorTest.java | 8 ++----
.../spring/dc/ScriptDataConnectorParserTest.java | 10 +++-----
.../dc/http/HTTPDataConnectorParserTest.java | 30 ++++++++++------------
.../StorageBackedIdPSessionSerializerTest.java | 8 ++----
8 files changed, 37 insertions(+), 69 deletions(-)
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
index 08d6af6..29dd635 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
@@ -38,6 +38,7 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
@@ -63,11 +64,6 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns a set containing the prc name. */
private EvaluableScript prcscScript;
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
@BeforeTest public void setup() throws Exception {
super.setUp();
@@ -75,7 +71,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
nullReturnScript = new EvaluableScript("JavaScript", "null;");
- if (!isV8()) {
+ if (!TestSupport.isJavaV8OrLater()) {
returnOneValueScript =
new EvaluableScript("JavaScript", new StringBuilder().append("importPackage(Packages.java.util);")
.append("filterContext.getPrefilteredIdPAttributes();").append("x = new HashSet();")
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
index 36f81ac..2d69777 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
@@ -29,6 +29,7 @@ import net.shibboleth.idp.attribute.filter.policyrule.impl.ScriptedPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.Assert;
@@ -42,13 +43,8 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
private Map<String, IdPAttribute> epaUid;
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
private String getScript() {
- if (isV8()) {
+ if (TestSupport.isJavaV8OrLater()) {
return "scripted-v8.xml";
}
return "scripted.xml";
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
index af02b56..03ef4e9 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
@@ -53,6 +53,7 @@ import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.apache.commons.codec.digest.DigestUtils;
import org.opensaml.core.xml.XMLObjectBaseTestCase;
@@ -80,7 +81,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
private static Logger log = LoggerFactory.getLogger(ScriptedAttributeTest.class);
private String fileNameToPath(final String fileName, final boolean isV8Capable) {
- if (isV8() && !isV8Capable) {
+ if (TestSupport.isJavaV8OrLater() && !isV8Capable) {
return "/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/" + fileName;
}
return "/net/shibboleth/idp/attribute/resolver/impl/ad/" + fileName;
@@ -95,11 +96,6 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
return getScript(fileName, true);
}
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
/**
* Test resolution of an simple script (statically generated data).
*
@@ -309,7 +305,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
} catch (final ResolutionException ex) {
log.trace("Successful exception", ex);
} catch (final RuntimeException ex) {
- if (isV8() && (ex.getCause() instanceof ResolutionException)) {
+ if (TestSupport.isJavaV8OrLater() && (ex.getCause() instanceof ResolutionException)) {
// nashhorn wraps exceptions
log.trace("Successful exception", ex);
} else {
@@ -323,7 +319,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
failureTest("fail1.script", "Unknown method", true);
failureTest("fail2.script", "Bad output type", true);
- if (!isV8()) {
+ if (!TestSupport.isJavaV8OrLater()) {
// nashhorn is much more forgiving - and we tested for most of this in fails2
Assert.assertNull(buildTest("fail3.script", true).resolve(generateContext()), "returns nothing");
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
index 04976f4..0e282ff 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
@@ -40,6 +40,7 @@ import net.shibboleth.idp.attribute.resolver.dc.impl.TestCache;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
@@ -59,11 +60,6 @@ public class HTTPDataConnectorTest {
private HTTPDataConnector connector;
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
@BeforeMethod public void setUp() {
connector = new HTTPDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
@@ -87,7 +83,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -125,7 +121,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -150,7 +146,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -175,7 +171,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -223,7 +219,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -255,7 +251,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -290,7 +286,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -322,7 +318,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
index e70f0dc..376ff6d 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
@@ -38,6 +38,7 @@ import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
@@ -49,14 +50,9 @@ import org.testng.annotations.Test;
*/
public class ScriptedDataConnectorTest {
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
private String getScript(String fileName) throws IOException {
final String name;
- if (isV8()) {
+ if (TestSupport.isJavaV8OrLater()) {
name = "/net/shibboleth/idp/attribute/resolver/impl/dc/v8/" + fileName;
} else {
name = "/net/shibboleth/idp/attribute/resolver/impl/dc/" + fileName;
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
index a935b6e..10fd330 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
@@ -30,6 +30,7 @@ import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParse
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ScriptDataConnectorParser;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.Assert;
@@ -39,15 +40,10 @@ import org.testng.annotations.Test;
* test for {@link ScriptDataConnectorParser}
*/
public class ScriptDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
-
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
@Test public void simple() throws ComponentInitializationException, ResolutionException {
- if (isV8()) {
+ if (TestSupport.isJavaV8OrLater()) {
testConnector("scriptedAttributes-8.xml");
} else {
testConnector("scriptedAttributes.xml");
@@ -56,7 +52,7 @@ public class ScriptDataConnectorParserTest extends BaseAttributeDefinitionParser
@Test public void resolver() throws ComponentInitializationException, ResolutionException {
- if (isV8()) {
+ if (TestSupport.isJavaV8OrLater()) {
testConnector("resolver/scriptedAttributes-8.xml");
} else {
testConnector("resolver/scriptedAttributes.xml");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
index 790d605..67c310a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
@@ -42,6 +42,7 @@ import net.shibboleth.idp.attribute.resolver.dc.http.impl.HTTPDataConnector;
import net.shibboleth.idp.attribute.resolver.spring.dc.http.impl.HTTPDataConnectorParser;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
/** Test for {@link HTTPDataConnectorParser}. */
public class HTTPDataConnectorParserTest {
@@ -72,7 +73,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2Config() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -100,7 +101,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadProtocol() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -117,7 +118,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2Size() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -134,7 +135,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2Missing() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", "https://build.shibboleth.net/test.json");
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -151,7 +152,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2MissingOk() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", "https://build.shibboleth.net/test.json");
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -170,7 +171,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2Certificate() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
propSource.setProperty("certificate", "/org/opensaml/saml/metadata/resolver/impl/repo-entity.crt");
final HTTPDataConnector connector =
@@ -199,7 +200,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadCertificate() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
propSource.setProperty("certificate", "/org/opensaml/saml/metadata/resolver/impl/badKey.crt");
final HTTPDataConnector connector =
@@ -217,7 +218,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2CA() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt");
final HTTPDataConnector connector =
@@ -246,7 +247,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadCA() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/badCA.crt");
final HTTPDataConnector connector =
@@ -266,7 +267,7 @@ public class HTTPDataConnectorParserTest {
// Could use a better test for this end to end.
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
propSource.setProperty("key", "net/shibboleth/idp/attribute/resolver/spring/dc/http/client.key");
propSource.setProperty("certificate", "net/shibboleth/idp/attribute/resolver/spring/dc/http/client.crt");
@@ -295,7 +296,7 @@ public class HTTPDataConnectorParserTest {
@Test public void hybridConfig() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -326,7 +327,7 @@ public class HTTPDataConnectorParserTest {
final MockPropertySource propSource = singletonPropertySource("serviceURL", "https://shibboleth.net/cgi-bin/_frobnitz.cgi");
propSource.setProperty("serviceBody",
"[{\"name\" : \"foo\",\"values\" : [ \"foo1\" ]},{\"name\" : \"bar\",\"values\" : [ \"bar1\", \"bar2\" ]}]");
- propSource.setProperty("scriptPath", (isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
final HTTPDataConnector connector =
getDataConnector(propSource,
@@ -380,11 +381,6 @@ public class HTTPDataConnectorParserTest {
return (HTTPDataConnector) context.getBean("myHTTP");
}
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
private MockPropertySource singletonPropertySource(final String name, final String value) {
final MockPropertySource propSource = new MockPropertySource("localProperties");
propSource.setProperty(name, value);
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
index dfdfda6..7191479 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
@@ -31,6 +31,7 @@ import net.shibboleth.utilities.java.support.net.CookieManager;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy;
import net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
import org.opensaml.storage.impl.MemoryStorageService;
import org.testng.Assert;
@@ -139,7 +140,7 @@ public class StorageBackedIdPSessionSerializerTest {
session.doAddSPSession(new BasicSPSession("baz", INSTANT, exp));
String s = serializer.serialize(session);
- String s2 = fileToString(DATAPATH + "complexIdPSession." + (isV8() ? "jdk8" : "json"));
+ String s2 = fileToString(DATAPATH + "complexIdPSession." + (TestSupport.isJavaV8OrLater() ? "jdk8" : "json"));
Assert.assertEquals(s, s2);
StorageBackedIdPSession session2 = serializer.deserialize(1, "test", KEY, s2, exp);
@@ -150,11 +151,6 @@ public class StorageBackedIdPSessionSerializerTest {
Assert.assertEquals(session.getLastActivityInstant(), session2.getLastActivityInstant());
}
- private boolean isV8() {
- final String ver = System.getProperty("java.version");
- return ver.startsWith("1.8");
- }
-
private String fileToString(String pathname) throws URISyntaxException, IOException {
try (FileInputStream stream = new FileInputStream(
new File(StorageBackedIdPSessionSerializerTest.class.getResource(pathname).toURI()))) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list