[java-shib-common COMMIT] /branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 28 12:57:14 2014
New Revision: 1113

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1113&view=rev
Log:
SIDP-622 Make test results java  dependent.

Modified:
    branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ScriptedAttributeResolverTest.java

Modified: branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ScriptedAttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ScriptedAttributeResolverTest.java?rev=1113&r1=1112&r2=1113&view=diff
==============================================================================
--- branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ScriptedAttributeResolverTest.java (original)
+++ branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ScriptedAttributeResolverTest.java Tue Oct 28 12:57:14 2014
@@ -63,7 +63,11 @@
 
         BaseAttribute scripted = actual.get("scripted");
         assertEquals(3, scripted.getValues().size());
-        assertEquals(1, scripted.getEncoders().size());
+        if (isV8()) {
+            assertEquals(1, scripted.getEncoders().size());
+        } else {
+            assertEquals(0, scripted.getEncoders().size());
+        }
         assertEquals(expectedValues, scripted.getValues().toArray(expectedValues));
 
         context = new BaseSAMLProfileRequestContext();
@@ -72,7 +76,11 @@
         actual = resolver.resolveAttributes(context);
         scripted = actual.get("scripted");
         assertEquals(3, scripted.getValues().size());
-        assertEquals(1, scripted.getEncoders().size());
+        if (isV8()) {
+            assertEquals(1, scripted.getEncoders().size());
+        } else {
+            assertEquals(0, scripted.getEncoders().size());
+        }
         assertEquals(expectedValues, scripted.getValues().toArray(expectedValues));
         
         context = new BaseSAMLProfileRequestContext();
@@ -81,7 +89,11 @@
         actual = resolver.resolveAttributes(context);
         scripted = actual.get("scripted");
         assertEquals(3, scripted.getValues().size());
-        assertEquals(1, scripted.getEncoders().size());
+        if (isV8()) {
+            assertEquals(1, scripted.getEncoders().size());
+        } else {
+            assertEquals(0, scripted.getEncoders().size());
+        }
         assertEquals(expectedValues, scripted.getValues().toArray(expectedValues));
     }