[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src/test: java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jul 14 07:26:25 2014
New Revision: 6293

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6293&view=rev
Log:
IDP-394 Make the examples work for JDK8/Nashorn

Added:
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script
      - copied, changed from r6292, trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
      - copied, changed from r6292, trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java?rev=6293&r1=6292&r2=6293&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java Mon Jul 14 07:26:25 2014
@@ -365,7 +365,7 @@
 
         final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
         scripted.setId(attributeName);
-        scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(exampleScript)));
+        scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript(exampleScript, false)));
         scripted.setDependencies(ds);
 
         final Set<DataConnector> dataDefinitions = Collections.singleton((DataConnector) connector);
@@ -391,9 +391,6 @@
 
     @Test public void examples() throws ScriptException, IOException, ComponentInitializationException {
 
-        if (isV8()) {
-            return;
-        }
         IdPAttribute attribute = runExample("example1.script", "example1.attribute.xml", "swissEduPersonUniqueID");
 
         Assert.assertEquals(attribute.getValues().iterator().next().getValue(),

Modified: trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script?rev=6293&r1=6292&r2=6293&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script (original)
+++ trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script Mon Jul 14 07:26:25 2014
@@ -10,8 +10,10 @@
 // Create md5 value
 localpart = DigestUtils.md5Hex(uniqueValue);
  
-// Get attribute to add
-swissEduPersonUniqueID = new BasicAttribute("swissEduPersonUniqueID");
+// 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");

Modified: trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script?rev=6293&r1=6292&r2=6293&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script (original)
+++ trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script Mon Jul 14 07:26:25 2014
@@ -1,7 +1,9 @@
 importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
  
-// Create attribute to be returned from definition

[... 120 lines stripped ...]