[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr  4 16:07:38 2012
New Revision: 4161

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4161&view=rev
Log:
Tests are clean

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrecscopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java?rev=4161&r1=4160&r2=4161&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java Wed Apr  4 16:07:38 2012
@@ -141,14 +141,14 @@
         scriptContext.setAttribute(getId(), new Attribute(getId()), ScriptContext.ENGINE_SCOPE);
 
         log.debug("Attribute definition '{}': adding current attribute resolution context to script context", getId());
-        scriptContext.setAttribute("context", resolutionContext, ScriptContext.ENGINE_SCOPE);
+        scriptContext.setAttribute("requestContext", resolutionContext, ScriptContext.ENGINE_SCOPE);
 
         final Map<String, Set<AttributeValue>> dependencyAttributes =
                 PluginDependencySupport.getAllAttributeValues(resolutionContext, getDependencies());
         for (Entry<String, Set<AttributeValue>> dependencyAttribute : dependencyAttributes.entrySet()) {
-            log.debug(
-                    "Attribute definition '{}': adding dependant attribute '{}' with the following values to the script context: {}",
-                    new Object[] {getId(), dependencyAttribute.getKey(), dependencyAttribute.getValue()});
+            log.debug("Attribute definition '{}': adding dependant attribute '{}' "
+                    + " with the following values to the script context: {}", new Object[] {getId(),
+                    dependencyAttribute.getKey(), dependencyAttribute.getValue(),});
             scriptContext.setAttribute(dependencyAttribute.getKey(), dependencyAttribute.getValue(),
                     ScriptContext.ENGINE_SCOPE);
         }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java?rev=4161&r1=4160&r2=4161&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java Wed Apr  4 16:07:38 2012
@@ -108,10 +108,10 @@
             velocityContext = new VelocityContext();
 
             for (String attributeId : sourceValues.keySet()) {
-                final Object value = sourceValues.get(attributeId).next();
+                final AttributeValue value = sourceValues.get(attributeId).next();
                 log.debug("Attribute definition '{}': adding value '{}' for attribute '{}' to the template context",
                         new Object[] {getId(), value.toString(), attributeId,});
-                velocityContext.put(attributeId, value);
+                velocityContext.put(attributeId, value.getValue());
             }
 
             try {
@@ -162,7 +162,8 @@
         final Map<String, Set<AttributeValue>> dependencyAttributes =
                 PluginDependencySupport.getAllAttributeValues(resolutionContext, getDependencies());
 
-        final int valueCount = dependencyAttributes.values().iterator().next().size();
+        int valueCount = 0;
+        boolean valueCountSet = false;
 
         HashSet<String> attributeValues;
         for (Entry<String, Set<AttributeValue>> dependencyAttribute : dependencyAttributes.entrySet()) {
@@ -177,8 +178,11 @@
                                     + value.getClass().getName()));
                 }
             }
-
-            if (attributeValues.size() != valueCount) {
+            
+            if (!valueCountSet) {

[... 200 lines stripped ...]