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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan 11 08:52:27 2013
New Revision: 4264

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4264&view=rev
Log:
Better naming of the mock static attribute sources used in the tests.

Added:
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java
      - copied, changed from r4263, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
      - copied, changed from r4263, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestDataConnector.java
Modified:
    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/TestAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestDataConnector.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=4264&r1=4263&r2=4264&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 Fri Jan 11 08:52:27 2013
@@ -194,7 +194,7 @@
         Assert.assertTrue(context.getResolvedDataConnectors().get("bar").resolve(context) == Optional.<Map<String, Attribute>>absent());
         
         try {
-            TestDataConnector other = new TestDataConnector();
+            MockStaticDataConnector other = new MockStaticDataConnector();
             other.setId("bar");
             other.setValues(Collections.EMPTY_LIST);
             other.initialize();

Copied: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java (from r4263, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestAttributeDefinition.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java?p2=trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java&p1=trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestAttributeDefinition.java&r1=4263&r2=4264&rev=4264&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java Fri Jan 11 08:52:27 2013
@@ -36,10 +36,10 @@
 /** An attribute definition that simply returns a static value.   Used for testing only.  This is 
  * a cut and paste job from StaticAttributeDefinition in idp-attribute-resolver-impl */
 @ThreadSafe
-public class TestAttributeDefinition extends BaseAttributeDefinition {
+public class MockStaticAttributeDefinition extends BaseAttributeDefinition {
     
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(TestAttributeDefinition.class);
+    private final Logger log = LoggerFactory.getLogger(MockStaticAttributeDefinition.class);
 
     /** Static value returned by this definition. */
     private Optional<Attribute> value = Optional.absent();

Copied: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java (from r4263, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/TestDataConnector.java)

[... 205 lines stripped ...]