[java-identity-provider] branch master updated: Removed confusing and unrequired code from javascript examples test.

[Rod Widdowson]

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=ea002c8031eb75a278cddca077a9645f4545fdd9

The following commit(s) were added to refs/heads/master by this push:
       new  ea002c8   Removed confusing and unrequired code from javascript examples test.
ea002c8 is described below

commit ea002c8031eb75a278cddca077a9645f4545fdd9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 10 16:49:52 2019 +0100

    Removed confusing and unrequired code from javascript examples test.
---
 .../shibboleth/idp/attribute/resolver/impl/ad/jdk8/example1.script   | 4 ----
 .../shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script   | 5 -----
 .../shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script   | 4 +---
 .../shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script   | 2 --
 4 files changed, 1 insertion(+), 14 deletions(-)

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
index b06abe6..32f29ab 100644
--- 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
@@ -12,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. 
-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/jdk8/example2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example2.script
index 3ede1ba..e84f98b 100644
--- 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
@@ -1,11 +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 
-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/jdk8/example3.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example3.script
index 55731ba..d0653b4 100644
--- 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
@@ -1,8 +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/jdk8/example4.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/example4.script
index f84ee69..995b74a 100644
--- 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
@@ -1,8 +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")) {

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