[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttribut...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Oct  2 12:05:13 2016
New Revision: 8447

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8447&view=rev
Log:
Fix build 

Modified:
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java

Modified: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java?rev=8447&r1=8446&r2=8447&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java	(original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java	Sun Oct  2 12:05:13 2016
@@ -31,6 +31,7 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
+import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImplTest;
 import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.profile.ActionTestingSupport;
 import net.shibboleth.idp.profile.IdPEventIds;
@@ -69,10 +70,10 @@
         attribute.setValues(Collections.singleton(new StringAttributeValue("value1")));
 
         final LazySet<AttributeDefinition> definitions = new LazySet<>();
-        AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
+        final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
         definitions.add(ad1);
 
-        final AttributeResolverImpl resolver = new AttributeResolverImpl("resolver", definitions, null, null);
+        final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
         ad1.initialize();
         resolver.initialize();
 
@@ -85,7 +86,7 @@
         // The attribute resolution context should be removed by the resolve attributes action.
         Assert.assertNull(prc.getSubcontext(AttributeResolutionContext.class));
 
-        AttributeContext resolvedAttributeCtx =
+        final AttributeContext resolvedAttributeCtx =
                 prc.getSubcontext(RelyingPartyContext.class).getSubcontext(AttributeContext.class);
         Assert.assertNotNull(resolvedAttributeCtx);
 
@@ -103,10 +104,10 @@
         attribute.setValues(Collections.singleton(new StringAttributeValue("value1")));
 
         final LazySet<AttributeDefinition> definitions = new LazySet<>();
-        AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
+        final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
         definitions.add(ad1);
 
-        final AttributeResolverImpl resolver = new AttributeResolverImpl("resolver", definitions, null, null);
+        final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
         ad1.initialize();
         resolver.initialize();
 
@@ -162,10 +163,10 @@
         attribute.setValues(Collections.singleton(new StringAttributeValue("value1")));
 
         final LazySet<AttributeDefinition> definitions = new LazySet<>();
-        AttributeDefinition ad1 = new MockAttributeDefinition("ad1", new ResolutionException());
+        final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", new ResolutionException());
         definitions.add(ad1);
 
-        final AttributeResolverImpl resolver = new AttributeResolverImpl("resolver", definitions, null, null);
+        final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
         ad1.initialize();
         resolver.initialize();
 
@@ -202,7 +203,7 @@
         
         private ServiceableComponent<AttributeResolver> component;
         
-        protected AttributeService(ServiceableComponent<AttributeResolver> what) {
+        protected AttributeService(final ServiceableComponent<AttributeResolver> what) {
             component = what;
         }