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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 13 21:29:40 2014
New Revision: 6896

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6896&view=rev
Log:
IDP-418 - Fix tests.

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapperTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapperTest.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapperTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapperTest.java?rev=6896&r1=6895&r2=6896&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapperTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapperTest.java Thu Nov 13 21:29:40 2014
@@ -158,7 +158,6 @@
 
         Map<String, IdPRequestedAttribute> result =
                 mapper.mapAttribute(getAttr(SAML_NAME_THREE));
-        Assert.assertTrue(result.containsKey(ID));
-        Assert.assertNull(result.get(ID));
+        Assert.assertFalse(result.containsKey(ID));
     }
 }

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapperTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapperTest.java?rev=6896&r1=6895&r2=6896&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapperTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapperTest.java Thu Nov 13 21:29:40 2014
@@ -76,10 +76,9 @@
         Assert.assertEquals(result.keySet().size(), 2);
         
         Collection<IdPRequestedAttribute> id = result.get("id");
-        Assert.assertEquals(id.size(), 2);
+        Assert.assertEquals(id.size(), 1);
         Iterator<IdPRequestedAttribute> itr = id.iterator();
         Assert.assertEquals(itr.next().getId(), "id");
-        Assert.assertNull(itr.next());
         
         Assert.assertEquals(result.get("id2").size(), 1);
     }