[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test: java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 30 05:03:54 2014
New Revision: 6188

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6188&view=rev
Log:
IDP-269 checkpoint work with directly injected DataSource.  Also rename regression test for IDP-426

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java?rev=6188&r1=6187&r2=6188&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java Mon Jun 30 05:03:54 2014
@@ -61,7 +61,6 @@
     @BeforeTest public void setupSource() throws SQLException, IOException {
 
         testSource = DatabaseTestingSupport.GetMockDataSource(INIT_FILE, "storedId");
-        setupConnectors("stored.xml");
     }
 
     @AfterClass public void teardown() {
@@ -92,7 +91,8 @@
         Assert.assertTrue(principalConnector.getRelyingParties().isEmpty());
     }
     
-    @Test(enabled=false) public void reverseMap() throws ResolutionException {
+    @Test(enabled=false) public void case426() throws ResolutionException {
+        setupConnectors("stored.xml");
         
         final AttributeResolutionContext context = new AttributeResolutionContext();
         context.setPrincipal("PRINCIPAL");
@@ -106,4 +106,22 @@
 
         Assert.assertNotNull(result.get("result"));
     }
+
+    
+    @Test(enabled=true) public void directStore() throws ResolutionException {
+        setupConnectors("stored-direct.xml");
+        
+        final AttributeResolutionContext context = new AttributeResolutionContext();
+        context.setPrincipal("PRINCIPAL");
+        context.setAttributeIssuerID("ISSUER");
+        context.setAttributeRecipientID("Recipient");
+        context.getSubcontext(AttributeResolverWorkContext.class, true);
+       
+        ar.resolveAttributes(context);
+        
+        final Map<String, IdPAttribute> result = context.getResolvedIdPAttributes();
+
+        Assert.assertNotNull(result.get("result"));
+    }
+    
 }