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

[noreply at shibboleth.net]

Author: rdw
Date: Sat May  4 09:48:02 2013
New Revision: 4463

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4463&view=rev
Log:
IDP-207  Remove Optional from some tests

Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/UntargettedAttributeValueFilterTest.java

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java?rev=4463&r1=4462&r2=4463&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/BaseComplexAttributeFilterTestCase.java Sat May  4 09:48:02 2013
@@ -33,7 +33,6 @@
 import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 
 /**
  * Base class for testing complex attribute filter operations.
@@ -51,7 +50,7 @@
      * @throws ComponentInitializationException
      * @throws ResolutionException
      */
-    protected Optional<Map<String, Attribute>> getAttributes(String xmlFileName) throws ComponentInitializationException, ResolutionException {
+    protected Map<String, Attribute> getAttributes(String xmlFileName) throws ComponentInitializationException, ResolutionException {
         
         final EntityAttributes obj = (EntityAttributes) unmarshallElement(PATH + xmlFileName);
 
@@ -68,7 +67,7 @@
         
         connector.initialize();
         
-        return Optional.fromNullable(connector.doResolve(null));
+        return connector.doResolve(null);
     }
 
     protected AttributeFilteringEngine getPolicy(String xmlFileName) {

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java?rev=4463&r1=4462&r2=4463&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java Sat May  4 09:48:02 2013
@@ -85,20 +85,20 @@
         engine.initialize();
 
         AttributeFilterContext context = new AttributeFilterContext();
-        context.setPrefilteredAttributes(getAttributes("epa-uidwithjsmith.xml").get().values());
+        context.setPrefilteredAttributes(getAttributes("epa-uidwithjsmith.xml").values());
         engine.filterAttributes(context);
         Map<String, Attribute> attributes = context.getFilteredAttributes();
         Attribute attribute = attributes.get("eduPersonAffiliation");
         Assert.assertEquals(attribute.getValues().size(), 3);
 
         context = new AttributeFilterContext();
-        context.setPrefilteredAttributes(getAttributes("uid-epawithjsmith.xml").get().values());
+        context.setPrefilteredAttributes(getAttributes("uid-epawithjsmith.xml").values());
         engine.filterAttributes(context);
         attributes = context.getFilteredAttributes();
         Assert.assertNull(attributes.get("eduPersonAffiliation"));
 
         context = new AttributeFilterContext();
-        context.setPrefilteredAttributes(getAttributes("epa-uid.xml").get().values());
+        context.setPrefilteredAttributes(getAttributes("epa-uid.xml").values());
         engine.filterAttributes(context);
         attributes = context.getFilteredAttributes();
         Assert.assertNull(attributes.get("eduPersonAffiliation"));
@@ -134,20 +134,20 @@
         engine.initialize();
 
         AttributeFilterContext context = new AttributeFilterContext();
-        context.setPrefilteredAttributes(getAttributes("epa-uidwithjsmith.xml").get().values());
+        context.setPrefilteredAttributes(getAttributes("epa-uidwithjsmith.xml").values());
         engine.filterAttributes(context);
         Map<String, Attribute> attributes = context.getFilteredAttributes();
         Attribute attribute = attributes.get("eduPersonAffiliation");

[... 71 lines stripped ...]