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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jan  9 07:19:42 2013
New Revision: 4263

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4263&view=rev
Log:
Move the StaticAttributeDefinition and StaticDataConnector into idp-attribute-resolver-impl.  Introduce cut/paste classes to perform that job for testing idp-attribute-resolver-api

Added:
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestDataConnector.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/StaticAttributeDefinition.java
      - copied, changed from r4261, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StaticDataConnector.java
      - copied, changed from r4261, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/StaticAttributeDefinitionTest.java
      - copied, changed from r4261, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StaticDataConnectorTest.java
      - copied, changed from r4261, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/StaticDataConnectorTest.java
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticDataConnector.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolverTestSupport.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/StaticDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeTest.java

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java?rev=4263&r1=4262&r2=4263&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java Wed Jan  9 07:19:42 2013
@@ -194,7 +194,7 @@
         Assert.assertTrue(context.getResolvedDataConnectors().get("bar").resolve(context) == Optional.<Map<String, Attribute>>absent());
         
         try {
-            StaticDataConnector other = new StaticDataConnector();
+            TestDataConnector other = new TestDataConnector();
             other.setId("bar");
             other.setValues(Collections.EMPTY_LIST);
             other.initialize();

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java?rev=4263&r1=4262&r2=4263&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java Wed Jan  9 07:19:42 2013
@@ -68,12 +68,12 @@
     }
 
     @Test public void testGetMergedAttributeValueWithMultipleDependencies() {
-        StaticDataConnector connector1 =
+        TestDataConnector connector1 =

[... 304 lines stripped ...]