[java-identity-provider] branch master updated: Fix script test issues for both Java versions.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor 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=b069af5a7821512839076b91efcb996f311e12ca

The following commit(s) were added to refs/heads/master by this push:
       new  b069af5   Fix script test issues for both Java versions.
b069af5 is described below

commit b069af5a7821512839076b91efcb996f311e12ca
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Sat May 20 20:00:54 2017 -0400

    Fix script test issues for both Java versions.
---
 .../resolver/dc/http/impl/HTTPDataConnectorTest.java        | 10 +++++++++-
 .../shibboleth/idp/attribute/resolver/impl/dc/http/test.js  | 13 ++++++-------
 .../idp/attribute/resolver/impl/dc/http/{ => v8}/test.js    |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

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 054f545..d01b00c 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
@@ -54,9 +54,16 @@ public class HTTPDataConnectorTest {
                     "idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.json");
 
     private static final String SCRIPT_PATH = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js";
+    
+    private static final String SCRIPT_PATH_V8 = "/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js";
 
     private HTTPDataConnector connector;
     
+    private boolean isV8() {
+        final String ver = System.getProperty("java.version");
+        return ver.startsWith("1.8");
+    }
+    
     @BeforeMethod public void setUp() throws IOException, ScriptException {
         connector = new HTTPDataConnector();
         connector.setId(TEST_CONNECTOR_NAME);
@@ -66,7 +73,8 @@ public class HTTPDataConnectorTest {
                     .build());
         
         final ScriptedResponseMappingStrategy mapping =
-                ScriptedResponseMappingStrategy.resourceScript(ResourceHelper.of(new ClassPathResource(SCRIPT_PATH)));
+                ScriptedResponseMappingStrategy.resourceScript(
+                        ResourceHelper.of(new ClassPathResource(isV8() ? SCRIPT_PATH_V8 : SCRIPT_PATH)));
         mapping.setLogPrefix(TEST_CONNECTOR_NAME + ":");
         connector.setMappingStrategy(mapping);
     }
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 1c1fbe2..b1cce73 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,10 +1,9 @@
-var EntityHelper = Java.type("org.apache.http.util.EntityUtils");
-var body = EntityHelper.toString(response.getEntity(), "UTF-8");
-var result = JSON.parse(body.toString("UTF-8"));
+importClass(Packages.java.util.HashSet);
+importClass(Packages.org.apache.http.util.EntityUtils);
+importPackage(Packages.net.shibboleth.idp.attribute);
 
-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");
+var body = EntityUtils.toString(response.getEntity(), "UTF-8");
+var result = JSON.parse(body);
 
 for (var i=0; i<result.length; i++) {
 
@@ -12,7 +11,7 @@ for (var i=0; i<result.length; i++) {
     var values = new HashSet();
     
     for (var j=0; j<result[i].values.length; j++) {
-        values.add(new StringValue(result[i].values[j]));
+        values.add(new StringAttributeValue(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/test.js b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js
similarity index 92%
copy from idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
copy to idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/v8/test.js
index 1c1fbe2..f8acb96 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/v8/test.js
@@ -1,6 +1,6 @@
 var EntityHelper = Java.type("org.apache.http.util.EntityUtils");
 var body = EntityHelper.toString(response.getEntity(), "UTF-8");
-var result = JSON.parse(body.toString("UTF-8"));
+var result = JSON.parse(body);
 
 var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
 var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.