[java-identity-provider] branch master updated: JPAR-137 Clean up old java7/Rhino tests
Rod Widdowson
rdw at steadingsoftware.com
Sun Mar 22 09:02:19 EDT 2020
This is an automated email from the git hooks/post-receive script.
rdw 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=a65f6604526096c1defcd2cf77be7a9d2688563c
The following commit(s) were added to refs/heads/master by this push:
new a65f660 JPAR-137 Clean up old java7/Rhino tests
a65f660 is described below
commit a65f6604526096c1defcd2cf77be7a9d2688563c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Mar 22 13:00:51 2020 +0000
JPAR-137 Clean up old java7/Rhino tests
https://issues.shibboleth.net/jira/browse/JPAR-137
Somehow during V4 development this never happened and it is confusing the
testing of thre GRAAL stuff. We will probably end up adding the files and
test back in if we want to support rhino.
---
.../filter/matcher/impl/ScriptedMatcherTest.java | 73 +++++++---------------
.../filter/spring/basic/ScriptedTest.java | 4 --
.../idp/attribute/filter/matcher/scripted-v8.xml | 14 -----
.../idp/attribute/filter/matcher/scripted.xml | 4 +-
.../idp/attribute/filter/policyrule/file.script | 3 +-
.../idp/attribute/filter/policyrule/file.v8.script | 2 -
.../attribute/filter/policyrule/scripted-v8.xml | 8 ---
.../idp/attribute/filter/policyrule/scripted.xml | 5 +-
.../resolver/ad/impl/ScriptedAttributeTest.java | 37 ++++-------
.../dc/http/impl/HTTPDataConnectorTest.java | 19 +++---
.../dc/impl/ScriptedDataConnectorTest.java | 8 +--
.../idp/attribute/resolver/impl/ad/context.script | 3 -
.../idp/attribute/resolver/impl/ad/example1.script | 6 +-
.../idp/attribute/resolver/impl/ad/example2.script | 6 +-
.../idp/attribute/resolver/impl/ad/example3.script | 5 +-
.../idp/attribute/resolver/impl/ad/example4.script | 3 +-
.../idp/attribute/resolver/impl/ad/fail3.script | 1 -
.../idp/attribute/resolver/impl/ad/fail6.script | 4 +-
.../attribute/resolver/impl/ad/jdk8/context.script | 7 ---
.../resolver/impl/ad/jdk8/example1.script | 17 -----
.../resolver/impl/ad/jdk8/example2.script | 27 --------
.../resolver/impl/ad/jdk8/example3.script | 7 ---
.../resolver/impl/ad/jdk8/example4.script | 8 ---
.../attribute/resolver/impl/ad/jdk8/fail6.script | 1 -
.../attribute/resolver/impl/ad/jdk8/logging.script | 6 --
.../resolver/impl/ad/jdk8/nullValue.script | 5 --
.../attribute/resolver/impl/ad/jdk8/simple2.script | 3 -
.../resolver/impl/ad/jdk8/simpleWithPredef.script | 6 --
.../idp/attribute/resolver/impl/ad/logging.script | 6 +-
.../attribute/resolver/impl/ad/nullValue.script | 6 +-
.../idp/attribute/resolver/impl/ad/simple2.script | 1 +
.../resolver/impl/ad/simpleWithPredef.script | 6 +-
.../idp/attribute/resolver/impl/dc/custom.js | 1 -
.../idp/attribute/resolver/impl/dc/http/test.js | 11 ++--
.../attribute/resolver/impl/dc/http/testsize.js | 11 ++--
.../idp/attribute/resolver/impl/dc/http/v8/test.js | 20 ------
.../attribute/resolver/impl/dc/http/v8/testsize.js | 20 ------
.../resolver/impl/dc/scriptedConnector.js | 19 +++---
.../idp/attribute/resolver/impl/dc/v8/custom.js | 1 -
.../idp/attribute/resolver/impl/dc/v8/error.js | 1 -
.../resolver/impl/dc/v8/scriptedConnector.js | 45 -------------
.../spring/dc/ScriptDataConnectorParserTest.java | 7 +--
.../dc/http/HTTPDataConnectorParserTest.java | 24 ++++---
.../spring/dc/resolver/scriptedAttributes-8.xml | 10 ---
.../spring/dc/resolver/scriptedAttributes.xml | 25 +-------
.../context/navigate/ScriptedFunctionTest.java | 40 ++++--------
.../SpringExpressionContextLookupFunctionTest.java | 1 +
.../SpringStatusMessageLookupFunctionTest.java | 1 +
.../StorageBackedIdPSessionSerializerTest.java | 14 ++---
49 files changed, 127 insertions(+), 435 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 44041f6..9bdc78f 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
@@ -50,7 +50,6 @@ 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;
/** {@link ScriptedMatcher} unit test. */
@ThreadSafe
@@ -79,55 +78,31 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
nullReturnScript = new EvaluableScript("JavaScript", "null;");
- if (!TestSupport.isJavaV8OrLater()) {
- returnOneValueScript =
- new EvaluableScript("JavaScript", new StringBuilder().append("importPackage(Packages.java.util);")
- .append("filterContext.getPrefilteredIdPAttributes();").append("x = new HashSet();")
- .append("x.add(attribute.getValues().iterator().next());").append("x;").toString());
-
- invalidReturnObjectScript = new EvaluableScript("JavaScript", "new java.lang.String();");
-
- addedValuesScript =
- new EvaluableScript("JavaScript", new StringBuilder().append("importPackage(Packages.java.util);")
- .append("x = new HashSet();").append("x.add(attribute.getValues().iterator().next());")
- .append("x.add(new net.shibboleth.idp.attribute.StringAttributeValue(\"a\"));")
- .append("x;").toString());
- prcscScript =
- new EvaluableScript(
- "JavaScript",
- new StringBuilder("importPackage(Packages.net.shibboleth.idp.attribute);")
- .append("x = new java.util.HashSet(1);\n")
- .append("x.add(new StringAttributeValue(profileContext.getClass().getName()));\n")
- .append("x.add(new StringAttributeValue(subjects[0].getPrincipals().iterator().next().getName()));\n")
- .append("x;").toString());
- } else {
-
- returnOneValueScript =
- new EvaluableScript("JavaScript", new StringBuilder()
- .append("load('nashorn:mozilla_compat.js');importPackage(Packages.java.util);")
- .append("filterContext.getPrefilteredIdPAttributes();").append("x = new HashSet();")
- .append("x.add(attribute.getValues().iterator().next());").append("x;").toString());
-
- invalidReturnObjectScript =
- new EvaluableScript("JavaScript", "load('nashorn:mozilla_compat.js');new java.lang.String();");
-
- addedValuesScript =
- new EvaluableScript("JavaScript", new StringBuilder()
- .append("load('nashorn:mozilla_compat.js');importPackage(Packages.java.util);")
- .append("importPackage(Packages.net.shibboleth.idp.attribute);")
- .append("x = new HashSet();").append("x.add(attribute.getValues().iterator().next());")
- .append("x.add(new StringAttributeValue(\"a\"));").append("x;").toString());
- prcscScript =
- new EvaluableScript(
- "JavaScript",
- new StringBuilder("HashSet = Java.type(\"java.util.HashSet\");\n")
- .append("StringAttributeValue = Java.type(\"net.shibboleth.idp.attribute.StringAttributeValue\");\n")
- .append("x = new HashSet(1);\n")
- .append("x.add(new StringAttributeValue(profileContext.getClass().getName()));\n")
- .append("x.add(new StringAttributeValue(subjects[0].getPrincipals().iterator().next().getName()));\n")
- .append("x;").toString());
+ returnOneValueScript =
+ new EvaluableScript("JavaScript", new StringBuilder()
+ .append("load('nashorn:mozilla_compat.js');importPackage(Packages.java.util);")
+ .append("filterContext.getPrefilteredIdPAttributes();").append("x = new HashSet();")
+ .append("x.add(attribute.getValues().iterator().next());").append("x;").toString());
+
+ invalidReturnObjectScript =
+ new EvaluableScript("JavaScript", "load('nashorn:mozilla_compat.js');new java.lang.String();");
+
+ addedValuesScript =
+ new EvaluableScript("JavaScript", new StringBuilder()
+ .append("load('nashorn:mozilla_compat.js');importPackage(Packages.java.util);")
+ .append("importPackage(Packages.net.shibboleth.idp.attribute);")
+ .append("x = new HashSet();").append("x.add(attribute.getValues().iterator().next());")
+ .append("x.add(new StringAttributeValue(\"a\"));").append("x;").toString());
+ prcscScript =
+ new EvaluableScript(
+ "JavaScript",
+ new StringBuilder("HashSet = Java.type(\"java.util.HashSet\");\n")
+ .append("StringAttributeValue = Java.type(\"net.shibboleth.idp.attribute.StringAttributeValue\");\n")
+ .append("x = new HashSet(1);\n")
+ .append("x.add(new StringAttributeValue(profileContext.getClass().getName()));\n")
+ .append("x.add(new StringAttributeValue(subjects[0].getPrincipals().iterator().next().getName()));\n")
+ .append("x;").toString());
- }
}
@Test public void testGetMatcher() throws Exception {
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 9f217bcf..e089039 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
@@ -38,7 +38,6 @@ 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;
/** test for parsing scripted matchers and scripted parsers.
*
@@ -49,9 +48,6 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
private Map<String, IdPAttribute> epaUid;
private String getScript() {
- if (TestSupport.isJavaV8OrLater()) {
- return "scripted-v8.xml";
- }
return "scripted.xml";
}
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-v8.xml
deleted file mode 100644
index fec9083..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-v8.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="Script">
- <Script>
- <![CDATA[
- hs = Java.type("java.util.HashSet");
- x = new hs();
- x.add(attribute.getValues().iterator().next());
- x;
- ]]>
- </Script>
- </PermitValueRule>
-</AttributeRule>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
index b58514a..4596bd6 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
@@ -3,8 +3,8 @@
<PermitValueRule xsi:type="Script">
<Script>
<![CDATA[
- importPackage(Packages.java.util);
- x = new HashSet();
+ hs = Java.type("java.util.HashSet");
+ x = new hs();
x.add(attribute.getValues().iterator().next());
x;
]]>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script
index 44f4cd4..9370154 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script
@@ -1 +1,2 @@
-new java.lang.Boolean(false);
\ No newline at end of file
+bool = Java.type("java.lang.Boolean");
+new bool(false);
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script
deleted file mode 100644
index 9370154..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script
+++ /dev/null
@@ -1,2 +0,0 @@
-bool = Java.type("java.lang.Boolean");
-new bool(false);
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-v8.xml
deleted file mode 100644
index 3084c5f..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-v8.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
- <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.v8.script</ScriptFile>
- </PolicyRequirementRule>
-</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
index f41f4cc..c40722e 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
@@ -1,7 +1,8 @@
<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ <PolicyRequirementRule xsi:type="Script" language="JavaScript" customObjectRef="other.CustomScriptObject">
<ScriptFile>src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script</ScriptFile>
</PolicyRequirementRule>
</AttributeFilterPolicy>
\ No newline at end of file
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 e3876c2..790c622 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
@@ -69,7 +69,6 @@ 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;
/** test for {@link net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedIdPAttributeImpl}. */
@SuppressWarnings("javadoc")
@@ -86,20 +85,13 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
private static Logger log = LoggerFactory.getLogger(ScriptedAttributeTest.class);
- private String fileNameToPath(final String fileName, final boolean isV8Capable) {
- if (TestSupport.isJavaV8OrLater() && !isV8Capable) {
- return "/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/" + fileName;
- }
+ private String fileNameToPath(final String fileName) {
return "/net/shibboleth/idp/attribute/resolver/impl/ad/" + fileName;
}
- private String getScript(final String fileName, final boolean isV8Capable) throws IOException {
- return StringSupport.inputStreamToString(getClass().getResourceAsStream(fileNameToPath(fileName, isV8Capable)),
- null);
- }
-
private String getScript(final String fileName) throws IOException {
- return getScript(fileName, true);
+ return StringSupport.inputStreamToString(getClass().getResourceAsStream(fileNameToPath(fileName)),
+ null);
}
/**
@@ -215,7 +207,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
- attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simple2.script", false)));
+ attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simple2.script")));
attr.initialize();
assertNotNull(attr.getScript());
@@ -237,7 +229,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
- attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("nullValue.script", false)));
+ attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("nullValue.script")));
attr.initialize();
assertNotNull(attr.getScript());
@@ -258,7 +250,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
- attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("logging.script", false)));
+ attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("logging.script")));
attr.initialize();
final IdPAttribute val = attr.resolve(generateContext());
@@ -278,7 +270,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
- attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simpleWithPredef.script", false)));
+ attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simpleWithPredef.script")));
attr.initialize();
assertNotNull(attr.getScript());
@@ -302,7 +294,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// OK
}
- attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(failingScript, v8Safe)));
+ attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(failingScript)));
attr.initialize();
return attr;
@@ -316,8 +308,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
} catch (final ResolutionException ex) {
log.trace("Successful exception", ex);
} catch (final RuntimeException ex) {
- if (TestSupport.isJavaV8OrLater() && (ex.getCause() instanceof ResolutionException)) {
- // nashhorn wraps exceptions
+ if (ex.getCause() instanceof ResolutionException) {
log.trace("Successful exception", ex);
} else {
throw ex;
@@ -330,10 +321,6 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
failureTest("fail1.script", "Unknown method", true);
failureTest("fail2.script", "Bad output type", true);
- if (!TestSupport.isJavaV8OrLater()) {
- // nashhorn is much more forgiving - and we tested for most of this in fails2
- assertNull(buildTest("fail3.script", true).resolve(generateContext()), "returns nothing");
- }
failureTest("fail4.script", "getValues, then getNativeAttributes", true);
failureTest("fail5.script", "getNativeAttributes, then getValues", true);
@@ -483,7 +470,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
- scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("context.script", false)));
+ scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("context.script")));
scripted.setDataConnectorDependencies(ds);
scripted.initialize();
@@ -528,7 +515,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(attributeName);
- scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(exampleScript, false)));
+ scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(exampleScript)));
scripted.setDataConnectorDependencies(ds);
final Set<DataConnector> dataDefinitions = Collections.singleton((DataConnector) connector);
@@ -648,7 +635,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final EntityAttributes obj;
public Locator(final String file) {
- obj = (EntityAttributes) unmarshallElement(fileNameToPath(file, true));
+ obj = (EntityAttributes) unmarshallElement(fileNameToPath(file));
}
/** {@inheritDoc} */
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 a0fa4fe..50579b7 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
@@ -44,7 +44,6 @@ import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.repository.RepositorySupport;
-import net.shibboleth.utilities.java.support.testing.TestSupport;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
@@ -61,8 +60,6 @@ public class HTTPDataConnectorTest {
private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/";
- private static final String SCRIPT_PATH_V8 = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/";
-
private HTTPDataConnector connector;
@BeforeMethod public void setUp() throws Exception {
@@ -90,7 +87,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -134,7 +131,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -159,7 +156,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "testsize.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -184,7 +181,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -232,7 +229,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -264,7 +261,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -299,7 +296,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((SCRIPT_PATH) + "test.js")));
mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
mapping.setAcceptStatuses(Collections.singleton(HttpStatus.SC_OK));
mapping.setAcceptTypes(Collections.singleton("application/json"));
@@ -331,7 +328,7 @@ public class HTTPDataConnectorTest {
final ScriptedResponseMappingStrategy mapping =
ScriptedResponseMappingStrategy.resourceScript(
- ResourceHelper.of(new ClassPathResource((TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js")));
+ ResourceHelper.of(new ClassPathResource((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 009679d..8a96155 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
@@ -43,7 +43,6 @@ 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;
/**
* Tests for {@link ScriptedDataConnector}
@@ -53,12 +52,7 @@ import net.shibboleth.utilities.java.support.testing.TestSupport;
public class ScriptedDataConnectorTest {
private String getScript(String fileName) throws IOException {
- final String name;
- if (TestSupport.isJavaV8OrLater()) {
- name = "/net/shibboleth/idp/attribute/resolver/impl/dc/v8/" + fileName;
- } else {
- name = "/net/shibboleth/idp/attribute/resolver/impl/dc/" + fileName;
- }
+ final String name = "/net/shibboleth/idp/attribute/resolver/impl/dc/" + fileName;
return StringSupport.inputStreamToString(getClass().getResourceAsStream(name), null);
}
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
index 4886dfe..007bc32 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
@@ -1,5 +1,3 @@
-importPackage(Packages.net.shibboleth.idp.attribute.resolver.impl.ad);
-
child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
Scripted.addValue(child.getClass().getSimpleName());
@@ -7,4 +5,3 @@ Scripted.addValue(profileContext.getClass().getSimpleName());
Scripted.addValue(resolutionContext.getPrincipal());
Scripted.addValue(resolutionContext.getAttributeIssuerID());
Scripted.addValue(resolutionContext.getAttributeRecipientID());
-
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
index f7a01ae..32f29ab 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
@@ -1,3 +1,5 @@
+load('nashorn:mozilla_compat.js')
+
// Import Shibboleth attribute provider
importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
@@ -10,10 +12,6 @@ uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
// Create md5 value
localpart = DigestUtils.md5Hex(uniqueValue);
-// Get attribute to add DO NOT DO THIS FOR NASHORN/JDK8
-if (null == swissEduPersonUniqueID ) {
- swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
-}
// Prepend unique and pseudo-random localpart to domain name
swissEduPersonUniqueID.getValues().add(localpart + "@switch.ch");
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
index b355b9d..e84f98b 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
@@ -1,10 +1,6 @@
+load('nashorn:mozilla_compat.js')
importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-// Create attribute to be returned from definition DO NOT DO FOR NASHORHN/JDK8
-if (null == eduPersonAffiliation) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
-
// Add at least one value
eduPersonAffiliation.getValues().add("affiliate");
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
index 52ae3b1..d0653b4 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
@@ -1,7 +1,6 @@
+load('nashorn:mozilla_compat.js')
importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-if (eduPersonAffiliation == null) {
- eduPersonAffiliation = new BasicAttribute("eduPersonAffiliation");
-}
+
is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
index 6fd043b..995b74a 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
@@ -1,7 +1,6 @@
+load('nashorn:mozilla_compat.js')
importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-// Create attribute to be returned from definition
-if (eduPersonEntitlement == null) eduPersonEntitlement = new BasicAttribute("eduPersonEntitlement");
if (eduPersonAffiliation.getValues().contains("staff") ||
eduPersonAffiliation.getValues().contains("student")) {
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script
deleted file mode 100644
index 74b978e..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail3.script
+++ /dev/null
@@ -1 +0,0 @@
-Scripted = null;
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
index fe942c2..a084fa8 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
@@ -1,3 +1 @@
-importPackage(Packages.java.lang);
-
-Scripted.addValue(new Integer(21));
+Scripted.addValue(new (Java.type("java.lang.Integer"))(21));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
deleted file mode 100644
index 007bc32..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
+++ /dev/null
@@ -1,7 +0,0 @@
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-
-Scripted.addValue(child.getClass().getSimpleName());
-Scripted.addValue(profileContext.getClass().getSimpleName());
-Scripted.addValue(resolutionContext.getPrincipal());
-Scripted.addValue(resolutionContext.getAttributeIssuerID());
-Scripted.addValue(resolutionContext.getAttributeRecipientID());
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
deleted file mode 100644
index 32f29ab..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
+++ /dev/null
@@ -1,17 +0,0 @@
-load('nashorn:mozilla_compat.js')
-
-// Import Shibboleth attribute provider
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Import Apache commons codecs
-importPackage(Packages.org.apache.commons.codec.digest);
-
-// Get the unique value
-uniqueValue = uidNumber.getValues().get(0) + "some#salt#value#12345679";
-
-// Create md5 value
-localpart = DigestUtils.md5Hex(uniqueValue);
-
-
-// Prepend unique and pseudo-random localpart to domain name
-swissEduPersonUniqueID.getValues().add(localpart + "@switch.ch");
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
deleted file mode 100644
index e84f98b..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
+++ /dev/null
@@ -1,27 +0,0 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-// Add at least one value
-eduPersonAffiliation.getValues().add("affiliate");
-
-// If the user has group membership
-if (typeof memberOf != "undefined" && memberOf != null ){
- // The go through each group membership and add the appropriate affiliation
- // The IdP will remove duplicate values so we don't need to worry about that here
- for ( i = 0; memberOf != null && i < memberOf.getValues().size(); i++ ){
- value = memberOf.getValues().get(i);
-
- if (value.indexOf("OU=Students") > 0){
- eduPersonAffiliation.getValues().add("student");
- }
-
- if (value.indexOf("OU=Teachers") > 0){
- eduPersonAffiliation.getValues().add("faculty");
- eduPersonAffiliation.getValues().add("staff");
- }
-
- if (value.indexOf("OU=Staff") > 0){
- eduPersonAffiliation.getValues().add("staff");
- }
- }
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
deleted file mode 100644
index d0653b4..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
+++ /dev/null
@@ -1,7 +0,0 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-is_Staff = memberOf != null && memberOf.getValues().contains("CN=All-Staff,OU=Groups and Resources,DC=EXAMPLE,DC=ORG");
-
-if (is_Staff) { eduPersonAffiliation.getValues().add("staff"); };
-if (is_Staff) { eduPersonAffiliation.getValues().add("member"); };
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
deleted file mode 100644
index 995b74a..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
+++ /dev/null
@@ -1,8 +0,0 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
-
-if (eduPersonAffiliation.getValues().contains("staff") ||
- eduPersonAffiliation.getValues().contains("student")) {
- eduPersonEntitlement.getValues().add("urn:mace:dir:entitlement:common-lib-terms");
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script
deleted file mode 100644
index a084fa8..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/fail6.script
+++ /dev/null
@@ -1 +0,0 @@
-Scripted.addValue(new (Java.type("java.lang.Integer"))(21));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script
deleted file mode 100644
index 01b3a41..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/logging.script
+++ /dev/null
@@ -1,6 +0,0 @@
-logger = Java.type("org.slf4j.LoggerFactory").getLogger("net.shibboleth.idp.attribute");
-
-Scripted.addValue("foo");
-Scripted.addValue("bar");
-
- logger.info("Values of scriptTest were: {} ", Scripted.getValues());
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script
deleted file mode 100644
index 198f2d3..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/nullValue.script
+++ /dev/null
@@ -1,5 +0,0 @@
-nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
-val = Java.type("net.shibboleth.idp.attribute.StringAttributeValue").valueOf(null);
-tmp.add(val);
-nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script
deleted file mode 100644
index ae4f180..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simple2.script
+++ /dev/null
@@ -1,3 +0,0 @@
-load('nashorn:mozilla_compat.js')
-importPackage(Packages.net.shibboleth.idp.attribute);
-Scripted.addValue(new StringAttributeValue("simple"));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script
deleted file mode 100644
index fc254df..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/simpleWithPredef.script
+++ /dev/null
@@ -1,6 +0,0 @@
-nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
-tmp.addAll(nativeAttribute.getValues());
-val = new (Java.type("net.shibboleth.idp.attribute.StringAttributeValue"))("simple");
-tmp.add(val);
-nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
index c71f69d..01b3a41 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
@@ -1,8 +1,6 @@
-importPackage(Packages.org.slf4j);
-
-logger = LoggerFactory.getLogger("net.shibboleth.idp.attribute");
+logger = Java.type("org.slf4j.LoggerFactory").getLogger("net.shibboleth.idp.attribute");
Scripted.addValue("foo");
Scripted.addValue("bar");
- logger.error("Values of scriptTest were: {} ", Scripted.getValues());
\ No newline at end of file
+ logger.info("Values of scriptTest were: {} ", Scripted.getValues());
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
index c3f3fa6..198f2d3 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
@@ -1 +1,5 @@
-Scripted.addValue(null);
+nativeAttribute = Scripted.getNativeAttribute();
+tmp = new (Java.type("java.util.HashSet"));
+val = Java.type("net.shibboleth.idp.attribute.StringAttributeValue").valueOf(null);
+tmp.add(val);
+nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
index c606150..ae4f180 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
@@ -1,2 +1,3 @@
+load('nashorn:mozilla_compat.js')
importPackage(Packages.net.shibboleth.idp.attribute);
Scripted.addValue(new StringAttributeValue("simple"));
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
index a732a76..fc254df 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
@@ -1,8 +1,6 @@
-importPackage(Packages.net.shibboleth.idp.attribute);
-importPackage(Packages.java.util);
nativeAttribute = Scripted.getNativeAttribute();
-tmp = new HashSet();
+tmp = new (Java.type("java.util.HashSet"));
tmp.addAll(nativeAttribute.getValues());
-val = new StringAttributeValue("simple");
+val = new (Java.type("net.shibboleth.idp.attribute.StringAttributeValue"))("simple");
tmp.add(val);
nativeAttribute.setValues(tmp);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/custom.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/custom.js
index a5384af..6b7c241 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/custom.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/custom.js
@@ -1,2 +1 @@
-
connectorResults.add(custom);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
index a99fcd4..ee14d9a 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
@@ -1,17 +1,18 @@
-importClass(Packages.java.util.HashSet);
-importClass(Packages.net.shibboleth.utilities.java.support.httpclient.HttpClientSupport);
-importPackage(Packages.net.shibboleth.idp.attribute);
-
+var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 1024);
var result = JSON.parse(body);
+var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+var HashSet = Java.type("java.util.HashSet");
+
for (var i=0; i<result.length; i++) {
var attr = new IdPAttribute(result[i].name);
var values = new HashSet();
for (var j=0; j<result[i].values.length; j++) {
- values.add(new StringAttributeValue(result[i].values[j]));
+ values.add(new StringValue(result[i].values[j]));
}
attr.setValues(values);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/testsize.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/testsize.js
index a6b5ef8..2fcccad 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/testsize.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/testsize.js
@@ -1,17 +1,18 @@
-importClass(Packages.java.util.HashSet);
-importClass(Packages.net.shibboleth.utilities.java.support.httpclient.HttpClientSupport);
-importPackage(Packages.net.shibboleth.idp.attribute);
-
+var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 10);
var result = JSON.parse(body);
+var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+var HashSet = Java.type("java.util.HashSet");
+
for (var i=0; i<result.length; i++) {
var attr = new IdPAttribute(result[i].name);
var values = new HashSet();
for (var j=0; j<result[i].values.length; j++) {
- values.add(new StringAttributeValue(result[i].values[j]));
+ values.add(new StringValue(result[i].values[j]));
}
attr.setValues(values);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js
deleted file mode 100644
index ee14d9a..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
-var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 1024);
-var result = JSON.parse(body);
-
-var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
-var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-var HashSet = Java.type("java.util.HashSet");
-
-for (var i=0; i<result.length; i++) {
-
- var attr = new IdPAttribute(result[i].name);
- var values = new HashSet();
-
- for (var j=0; j<result[i].values.length; j++) {
- values.add(new StringValue(result[i].values[j]));
- }
-
- attr.setValues(values);
- connectorResults.add(attr);
-}
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/testsize.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/testsize.js
deleted file mode 100644
index 2fcccad..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/testsize.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var HttpClientSupport = Java.type("net.shibboleth.utilities.java.support.httpclient.HttpClientSupport");
-var body = HttpClientSupport.toString(response.getEntity(), "UTF-8", 10);
-var result = JSON.parse(body);
-
-var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
-var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-var HashSet = Java.type("java.util.HashSet");
-
-for (var i=0; i<result.length; i++) {
-
- var attr = new IdPAttribute(result[i].name);
- var values = new HashSet();
-
- for (var j=0; j<result[i].values.length; j++) {
- values.add(new StringValue(result[i].values[j]));
- }
-
- attr.setValues(values);
- connectorResults.add(attr);
-}
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
index 118e8a6..00478bb 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
@@ -1,16 +1,20 @@
-importPackage(Packages.net.shibboleth.idp.attribute);
-importPackage(Packages.java.util);
-importPackage(Packages.java.lang);
+IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
+StringAttributeValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
+HashSet = Java.type("java.util.HashSet");
attr = new IdPAttribute("ScriptedOne");
-set = new LinkedHashSet(2);
+set = new HashSet(2);
set.add(new StringAttributeValue("Value 1"));
set.add(new StringAttributeValue("Value 2"));
attr.setValues(set);
connectorResults.add(attr);
+child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
+
+
+
attr = new IdPAttribute("TwoScripted");
-set = new LinkedHashSet(4);
+set = new HashSet(4);
set.add(new StringAttributeValue("1Value"));
set.add(new StringAttributeValue("2Value"));
set.add(new StringAttributeValue("3Value"));
@@ -18,7 +22,7 @@ attr.setValues(set);
connectorResults.add(attr);
attr = new IdPAttribute("Subjects");
-set = new LinkedHashSet(4);
+set = new HashSet(4);
x = subjects[0].getPrincipals().iterator();
while(x.hasNext()){
set.add(new StringAttributeValue(x.next().getName()));
@@ -31,10 +35,11 @@ attr.setValues(set);
connectorResults.add(attr);
-
child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
attr = new IdPAttribute("ThreeScripted");
set = new HashSet(1);
set.add(new StringAttributeValue(child.getClass().getSimpleName()));
attr.setValues(set);
connectorResults.add(attr);
+
+
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js
deleted file mode 100644
index 6b7c241..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/custom.js
+++ /dev/null
@@ -1 +0,0 @@
-connectorResults.add(custom);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/error.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/error.js
deleted file mode 100644
index bff809a..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/error.js
+++ /dev/null
@@ -1 +0,0 @@
-connectorResult.add(custom);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js
deleted file mode 100644
index 00478bb..0000000
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js
+++ /dev/null
@@ -1,45 +0,0 @@
-IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
-StringAttributeValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-HashSet = Java.type("java.util.HashSet");
-
-attr = new IdPAttribute("ScriptedOne");
-set = new HashSet(2);
-set.add(new StringAttributeValue("Value 1"));
-set.add(new StringAttributeValue("Value 2"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-
-
-
-attr = new IdPAttribute("TwoScripted");
-set = new HashSet(4);
-set.add(new StringAttributeValue("1Value"));
-set.add(new StringAttributeValue("2Value"));
-set.add(new StringAttributeValue("3Value"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-attr = new IdPAttribute("Subjects");
-set = new HashSet(4);
-x = subjects[0].getPrincipals().iterator();
-while(x.hasNext()){
- set.add(new StringAttributeValue(x.next().getName()));
- }
-x = subjects[1].getPrincipals().iterator();
-while (x.hasNext()){
- set.add(new StringAttributeValue(x.next().getName()));
- }
-attr.setValues(set);
-connectorResults.add(attr);
-
-
-child = profileContext.getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-attr = new IdPAttribute("ThreeScripted");
-set = new HashSet(1);
-set.add(new StringAttributeValue(child.getClass().getSimpleName()));
-attr.setValues(set);
-connectorResults.add(attr);
-
-
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 33f7437..1b76573 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
@@ -36,7 +36,6 @@ 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;
/**
* test for {@link ScriptDataConnectorParser}
@@ -46,11 +45,7 @@ public class ScriptDataConnectorParserTest extends BaseAttributeDefinitionParser
@Test public void resolver() throws ComponentInitializationException, ResolutionException {
- if (TestSupport.isJavaV8OrLater()) {
- testConnector("resolver/scriptedAttributes-8.xml");
- } else {
- testConnector("resolver/scriptedAttributes.xml");
- }
+ 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 854bb00..cd03fe5 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
@@ -59,8 +59,6 @@ public class HTTPDataConnectorParserTest {
private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/";
- private static final String SCRIPT_PATH_V8 = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/";
-
private GenericApplicationContext pendingTeardownContext = null;
@AfterMethod public void tearDownTestContext() {
@@ -79,7 +77,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2Config() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt");
@@ -109,7 +107,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadProtocol() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
final HTTPDataConnector connector =
@@ -127,7 +125,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2Size() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "testsize.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "testsize.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt");
@@ -147,7 +145,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", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt");
@@ -167,7 +165,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2MissingOk() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", "https://build.shibboleth.net/test.json");
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
final HTTPDataConnector connector =
@@ -187,7 +185,7 @@ public class HTTPDataConnectorParserTest {
@Test public void v2Certificate() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificate", "/org/opensaml/saml/metadata/resolver/impl/repo-entity.crt");
@@ -217,7 +215,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadCertificate() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificate", "/org/opensaml/saml/metadata/resolver/impl/badKey.crt");
@@ -236,7 +234,7 @@ public class HTTPDataConnectorParserTest {
@Test(expectedExceptions=ResolutionException.class) public void v2BadCA() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/badCA.crt");
@@ -257,7 +255,7 @@ public class HTTPDataConnectorParserTest {
// Could use a better test for this end to end.
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
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");
@@ -287,7 +285,7 @@ public class HTTPDataConnectorParserTest {
@Test public void hybridConfig() throws Exception {
final MockPropertySource propSource = singletonPropertySource("serviceURL", TEST_URL);
- propSource.setProperty("scriptPath", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
propSource.setProperty("certificateAuthority", "/org/opensaml/saml/metadata/resolver/impl/repo-rootCA.crt");
@@ -324,7 +322,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", (TestSupport.isJavaV8OrLater() ? SCRIPT_PATH_V8 : SCRIPT_PATH) + "test.js");
+ propSource.setProperty("scriptPath", (SCRIPT_PATH) + "test.js");
propSource.setProperty("userAgent", "disguised/1.0.0 hidden/3.4.5");
final HTTPDataConnector connector =
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes-8.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes-8.xml
deleted file mode 100644
index 4dd0479..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes-8.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DataConnector id="staticAttributes"
- xsi:type="ScriptedDataConnector"
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
- customObjectRef="other.CustomScriptObject"
-
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <ScriptFile>classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js</ScriptFile>
-</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes.xml
index 2ede7e7..4dd0479 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes.xml
@@ -2,30 +2,9 @@
<DataConnector id="staticAttributes"
xsi:type="ScriptedDataConnector"
xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
+
customObjectRef="other.CustomScriptObject"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <Script><![CDATA[
-importPackage(Packages.net.shibboleth.idp.attribute);
-importPackage(Packages.java.util);
-importPackage(Packages.java.lang);
-
-attr = new IdPAttribute("ScriptedOne");
-set = new HashSet(2);
-set.add(new StringAttributeValue("Value 1"));
-set.add(new StringAttributeValue("Value 2"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-attr = new IdPAttribute("TwoScripted");
-set = new HashSet(4);
-set.add(new StringAttributeValue("1Value"));
-set.add(new StringAttributeValue("2Value"));
-set.add(new StringAttributeValue("3Value"));
-attr.setValues(set);
-connectorResults.add(attr);
-
-connectorResults.add(new Integer(4));
- ]]></Script>
+ <ScriptFile>classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js</ScriptFile>
</DataConnector>
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/ScriptedFunctionTest.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/ScriptedFunctionTest.java
index 7c95b0b..9fd623e 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/ScriptedFunctionTest.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/ScriptedFunctionTest.java
@@ -26,42 +26,24 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.testing.TestSupport;
-
/**
*
*/
+ at SuppressWarnings("javadoc")
public class ScriptedFunctionTest {
- static final String STRING_RETURN_7 = "new java.lang.String(\"String\");";
- static final String STRING_RETURN_8 = "JavaString=Java.type(\"java.lang.String\"); new JavaString(\"String\");";
- static final String INTEGER_RETURN_7 = "new java.lang.Integer(37);";
- static final String INTEGER_RETURN_8 = "JavaInteger=Java.type(\"java.lang.Integer\"); new JavaInteger(37);";
-
- private String stringReturn() {
- if (TestSupport.isJavaV8OrLater()) {
- return STRING_RETURN_8;
- }
- return STRING_RETURN_7;
- }
-
- private String integerReturn() {
- if (TestSupport.isJavaV8OrLater()) {
- return INTEGER_RETURN_8;
- }
- return INTEGER_RETURN_7;
- }
-
-
+ static final String STRING_RETURN = "JavaString=Java.type(\"java.lang.String\"); new JavaString(\"String\");";
+ static final String INTEGER_RETURN = "JavaInteger=Java.type(\"java.lang.Integer\"); new JavaInteger(37);";
+
@Test public void simpleScript() throws ScriptException {
final ProfileRequestContext prc = new ProfileRequestContext();
- final Object string = ScriptedContextLookupFunction.inlineScript(stringReturn()).apply(prc);
+ final Object string = ScriptedContextLookupFunction.inlineScript(STRING_RETURN).apply(prc);
String s = (String) string;
Assert.assertEquals(s, "String");
- final Integer integer = (Integer) ScriptedContextLookupFunction.inlineScript(integerReturn()).apply(prc);
+ final Integer integer = (Integer) ScriptedContextLookupFunction.inlineScript(INTEGER_RETURN).apply(prc);
Assert.assertEquals(integer.intValue(), 37);
}
@@ -80,22 +62,22 @@ public class ScriptedFunctionTest {
@Test public void withType() throws ScriptException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
final ProfileRequestContext prc = new ProfileRequestContext();
- final ScriptedContextLookupFunction<ProfileRequestContext> script1 = ScriptedContextLookupFunction.inlineScript(stringReturn(), Object.class);
+ final ScriptedContextLookupFunction<ProfileRequestContext> script1 = ScriptedContextLookupFunction.inlineScript(STRING_RETURN, Object.class);
final String string = (String) script1.apply(prc);
Assert.assertEquals(string, "String");
- Assert.assertEquals(ScriptedContextLookupFunction.inlineScript(stringReturn(), String.class).apply(prc), "String");
+ Assert.assertEquals(ScriptedContextLookupFunction.inlineScript(STRING_RETURN, String.class).apply(prc), "String");
- Assert.assertNull(ScriptedContextLookupFunction.inlineScript(stringReturn(), Integer.class).apply(prc));
+ Assert.assertNull(ScriptedContextLookupFunction.inlineScript(STRING_RETURN, Integer.class).apply(prc));
- final Integer integer = (Integer) ScriptedContextLookupFunction.inlineScript(integerReturn()).apply(prc);
+ final Integer integer = (Integer) ScriptedContextLookupFunction.inlineScript(INTEGER_RETURN).apply(prc);
Assert.assertEquals(integer.intValue(), 37);
}
@Test public void messageContext() throws ScriptException {
- final ScriptedContextLookupFunction<MessageContext> script1 = ScriptedContextLookupFunction.inlineMessageContextScript(stringReturn(), Object.class);
+ final ScriptedContextLookupFunction<MessageContext> script1 = ScriptedContextLookupFunction.inlineMessageContextScript(STRING_RETURN, Object.class);
Assert.assertEquals(script1.apply(new MessageContext()), "String");
Assert.assertEquals(script1.apply(null), "String");
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
index 3e64a38..f0abddf 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
/**
* Test for {@link SpringExpressionContextLookupFunction}.
*/
+ at SuppressWarnings("javadoc")
public class SpringExpressionContextLookupFunctionTest {
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringStatusMessageLookupFunctionTest.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringStatusMessageLookupFunctionTest.java
index 03e82e4..92570e4 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringStatusMessageLookupFunctionTest.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/context/navigate/SpringStatusMessageLookupFunctionTest.java
@@ -36,6 +36,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/** {@link SpringStatusMessageLookupFunction} unit test. */
+ at SuppressWarnings("javadoc")
public class SpringStatusMessageLookupFunctionTest {
private MockRequestContext springRequestContext;
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 6b7cd7f..a054454 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
@@ -23,6 +23,11 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.time.Instant;
+import org.opensaml.storage.impl.MemoryStorageService;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
import net.shibboleth.idp.session.BasicSPSession;
@@ -32,14 +37,9 @@ 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.impl.SecureRandomIdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.testing.TestSupport;
-
-import org.opensaml.storage.impl.MemoryStorageService;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
/** {@link StorageBackedIdPSessionSerializer} unit test. */
+ at SuppressWarnings("javadoc")
public class StorageBackedIdPSessionSerializerTest {
private static final String DATAPATH = "/net/shibboleth/idp/session/impl/";
@@ -140,7 +140,7 @@ public class StorageBackedIdPSessionSerializerTest {
session.doAddSPSession(new BasicSPSession("baz", Instant.ofEpochMilli(INSTANT), exp));
// String s = serializer.serialize(session);
- String s2 = fileToString(DATAPATH + "complexIdPSession." + (TestSupport.isJavaV8OrLater() ? "jdk8" : "json"));
+ String s2 = fileToString(DATAPATH + "complexIdPSession.jdk8"); // .json is rhino ordering
// TODO: this comparison depends on Set order, so needs revisit.
// Assert.assertEquals(s, s2);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list