[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolve...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Oct 16 08:53:57 2016
New Revision: 8497

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8497&view=rev
Log:
IDP-1063 Fix test

https://issues.shibboleth.net/jira/browse/IDP-1063

One pure bug and one subtelty to do with ordering (and the fact that we dont use the principal to key into the StoredId Database)

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java?rev=8497&r1=8496&r2=8497&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java	Sun Oct 16 08:53:57 2016
@@ -87,16 +87,32 @@
 
     @Test public void initializeAndGetters() throws ComponentInitializationException, SQLException, ResolutionException {
 
-        final StoredIDDataConnector connector = new StoredIDDataConnector();
+        StoredIDDataConnector connector = new StoredIDDataConnector();
         connector.setId(TEST_CONNECTOR_NAME);
         connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
         connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
 
         tryInitialize(connector, "No DataSource");
-        connector.setDataSource(testSource);
-
+        connector = new StoredIDDataConnector();
+        connector.setId(TEST_CONNECTOR_NAME);
+        connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+        connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
+        connector.setDataSource(testSource);
+
+        connector = new StoredIDDataConnector();
+        connector.setId(TEST_CONNECTOR_NAME);
+        connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+        connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
+        connector.setDataSource(testSource);
         connector.setSalt(ComputedIDDataConnectorTest.smallSalt);
         tryInitialize(connector, "salt too small");
+
+        connector = new StoredIDDataConnector();
+        connector.setId(TEST_CONNECTOR_NAME);
+        connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+        connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
+        connector.setDataSource(testSource);
+        connector.setSalt(ComputedIDDataConnectorTest.smallSalt);
         connector.setSalt(ComputedIDDataConnectorTest.salt);
 
         Assert.assertEquals(connector.getDataSource(), testSource);
@@ -148,7 +164,7 @@
      * @throws SQLException if badness happens
      * @throws ResolutionException if badness happens
      */
-    @Test public void storeEntry() throws ComponentInitializationException, SQLException, ResolutionException {
+    @Test(dependsOnMethods={"noSalt",}) public void storeEntry() throws ComponentInitializationException, SQLException, ResolutionException {
         final AttributeResolver resolver = constructResolver(1);
 
         ComponentSupport.initialize(resolver);
@@ -183,7 +199,7 @@
         ComputedIDDataConnectorTest.connectorFromResolver(resolver).initialize();
 
         final AttributeResolutionContext context =
-                TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
+                TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID+1,
                         TestSources.SP_ENTITY_ID);
         resolver.resolveAttributes(context);