[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 Apr  6 07:59:08 2015
New Revision: 7471

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7471&view=rev
Log:
IDP-682 Fix PRC related unit tests

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/java/net/shibboleth/idp/attribute/resolver/ad/impl/TestContextContainer.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.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=7471&r1=7470&r2=7471&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 Apr  6 07:59:08 2015
@@ -48,7 +48,6 @@
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
-import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
 import org.opensaml.saml.saml2.core.Attribute;
 import org.slf4j.Logger;
@@ -389,11 +388,7 @@
         final AttributeResolverImpl resolver = new AttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
         resolver.initialize();
 
-        TestContextContainer parent = new TestContextContainer();
         final AttributeResolutionContext context = generateContext();
-        parent.addSubcontext(context);
-        ProfileRequestContext prc = new ProfileRequestContext<>();
-        prc.addSubcontext(parent);
 
         try {
             resolver.resolveAttributes(context);
@@ -405,7 +400,7 @@
         final Collection<IdPAttributeValue<?>> values = attribute.getValues();
 
         Assert.assertEquals(values.size(), 2, "looking for context");
-        Assert.assertTrue(values.contains(new StringAttributeValue("TestContextContainer")));
+        Assert.assertTrue(values.contains(new StringAttributeValue("AttributeResolutionContext")));
         Assert.assertTrue(values.contains(new StringAttributeValue("ProfileRequestContext")));
     }
 

Modified: trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.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/context.script?rev=7471&r1=7470&r2=7471&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.script (original)
+++ trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.script Mon Apr  6 07:59:08 2015
@@ -1,9 +1,7 @@
 importPackage(Packages.net.shibboleth.idp.attribute.resolver.impl.ad);
 
-clazloader = resolutionContext.getClass().getClassLoader();
-claz = clazloader.loadClass("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-child = resolutionContext.getParent().getSubcontext(claz);
+child = resolutionContext.getParent().getSubcontext("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
 
-Scripted.addValue(child.getParent().getClass().getSimpleName());
+Scripted.addValue(child.getClass().getSimpleName());
 Scripted.addValue(profileContext.getClass().getSimpleName());
 

Modified: trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.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/jdk8/context.script?rev=7471&r1=7470&r2=7471&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script (original)
+++ trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script Mon Apr  6 07:59:08 2015
@@ -1,6 +1,4 @@
-clazloader = resolutionContext.getClass().getClassLoader();
-claz = clazloader.loadClass("net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext");
-child = resolutionContext.getParent().getSubcontext(claz);

[... 6 lines stripped ...]