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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug 19 06:24:38 2015
New Revision: 7689

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7689&view=rev
Log:
IDP-794 tests for EmptyAttribute

https://issues.shibboleth.net/jira/browse/IDP-794

Updates supressed tests to match V2 semantics

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.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/PrescopedAtributeTest.java?rev=7689&r1=7688&r2=7689&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java	Wed Aug 19 06:24:38 2015
@@ -157,10 +157,11 @@
     }
     
     @Test(enabled=false) public void nullValueType() throws ComponentInitializationException, ResolutionException {
-        final List<IdPAttributeValue<?>> values = new ArrayList<>(3);
+        final List<IdPAttributeValue<?>> values = new ArrayList<>(4);
         values.add(new StringAttributeValue("one at two"));
         values.add(new EmptyAttributeValue(EmptyType.NULL_VALUE));
         values.add(new StringAttributeValue("three at four"));
+        values.add(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE));
         final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
 
         attr.setValues(values);

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.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/ScopedAttributeTest.java?rev=7689&r1=7688&r2=7689&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java	Wed Aug 19 06:24:38 2015
@@ -128,10 +128,11 @@
     }
     
     @Test(enabled=false) public void nullValueType() throws ComponentInitializationException, ResolutionException {
-        final List<IdPAttributeValue<?>> values = new ArrayList<>(3);
+        final List<IdPAttributeValue<?>> values = new ArrayList<>(4);
         values.add(new StringAttributeValue("one"));
         values.add(new EmptyAttributeValue(EmptyType.NULL_VALUE));
         values.add(new StringAttributeValue("three"));
+        values.add(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE));
         final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
 
         attr.setValues(values);

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java?rev=7689&r1=7688&r2=7689&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java	Wed Aug 19 06:24:38 2015
@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -353,14 +352,51 @@
         connector.setGeneratedAttributeId("wibble");
         connector.initialize();
 
-      final  Map<String, IdPAttribute> result = connector.resolve(resolutionContext);
-    final  IdPAttribute genAttr = result.get("wibble");
-
-        final List<IdPAttributeValue<?>> resultValues = genAttr.getValues();
-       Assert.assertEquals(resultValues.size(), 1);
-
-    }
-
+        try {
+            connector.resolve(resolutionContext);
+            Assert.fail("Should have thrown");
+        } catch (ResolutionException e) {
+            // OK
+        }
+
+    }
+
+    @Test(enabled=false) public void emptyValues() throws ComponentInitializationException, ResolutionException {
+        

[... 38 lines stripped ...]