[java-identity-provider] branch master updated: IDP-1121 Fix tests to refer to concrete class not interface
Rod Widdowson
rdw at steadingsoftware.com
Wed Apr 17 11:36:12 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=bc5735d8e21f05f97df45c30c12c726e5276e848
The following commit(s) were added to refs/heads/master by this push:
new bc5735d IDP-1121 Fix tests to refer to concrete class not interface
bc5735d is described below
commit bc5735d8e21f05f97df45c30c12c726e5276e848
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 17 16:33:31 2019 +0100
IDP-1121 Fix tests to refer to concrete class not interface
https://issues.shibboleth.net/jira/browse/IDP-1121
The attribute-reolver-impl tests can (and perhaps should) refer to the class they
are testing, by doing this we dramatically reduce the need to export the data
connectors or the attributes from the api.
---
.../resolver/dc/impl/ComputedIDDataConnectorTest.java | 17 ++++++++---------
.../resolver/dc/impl/StoredIDDataConnectorTest.java | 14 +++++++-------
.../resolver/impl/AttributeResolverImplTest.java | 3 +--
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
index e9c39f1..636d067 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
@@ -40,7 +40,6 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore;
import net.shibboleth.idp.attribute.impl.JDBCPairwiseIdStore;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
@@ -127,12 +126,12 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
}
- private AttributeResolver constructResolver(final int values) throws ComponentInitializationException {
+ private AttributeResolverImpl constructResolver(final int values) throws ComponentInitializationException {
final PairwiseIdDataConnector connector = new PairwiseIdDataConnector();
return constructResolver(connector, values, false);
}
- protected static AttributeResolver constructResolver(final PairwiseIdDataConnector connector, final int values, final boolean noSalt)
+ protected static AttributeResolverImpl constructResolver(final PairwiseIdDataConnector connector, final int values, final boolean noSalt)
throws ComponentInitializationException {
if (!noSalt) {
@@ -170,12 +169,12 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector));
}
- private AttributeResolver constructResolverWithNonString(final String dependantOn)
+ private AttributeResolverImpl constructResolverWithNonString(final String dependantOn)
throws ComponentInitializationException {
return constructResolverWithNonString(new PairwiseIdDataConnector(), dependantOn);
}
- protected static AttributeResolver constructResolverWithNonString(final PairwiseIdDataConnector connector,
+ protected static AttributeResolverImpl constructResolverWithNonString(final PairwiseIdDataConnector connector,
final String dependantOn) throws ComponentInitializationException {
final ComputedPairwiseIdStore store = new ComputedPairwiseIdStore();
@@ -206,7 +205,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector));
}
- protected static PairwiseIdDataConnector connectorFromResolver(final AttributeResolver resolver) {
+ protected static PairwiseIdDataConnector connectorFromResolver(final AttributeResolverImpl resolver) {
return (PairwiseIdDataConnector) resolver.getDataConnectors().get(TEST_CONNECTOR_NAME);
}
@@ -215,7 +214,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
}
@Test public void altDataConnector() throws ComponentInitializationException, ResolutionException {
- AttributeResolver resolver = constructResolver(1);
+ AttributeResolverImpl resolver = constructResolver(1);
connectorFromResolver(resolver).initialize();
ComponentSupport.initialize(resolver);
@@ -266,7 +265,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
}
@Test public void attributeFails() throws ComponentInitializationException, ResolutionException {
- AttributeResolver resolver = constructResolver(3);
+ AttributeResolverImpl resolver = constructResolver(3);
connectorFromResolver(resolver).initialize();
ComponentSupport.initialize(resolver);
@@ -324,7 +323,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
"wibble")));
simple.initialize();
- final AttributeResolver resolver =
+ final AttributeResolverImpl resolver =
AttributeResolverImplTest.newAttributeResolverImpl("atresolver", Collections.singleton((AttributeDefinition) simple), set);
ComponentSupport.initialize(resolver);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
index e7bccdf..5d911fe 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
@@ -37,9 +37,9 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.PairwiseId;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.impl.JDBCPairwiseIdStore;
-import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.idp.testing.DatabaseTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -65,11 +65,11 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
DatabaseTestingSupport.InitializeDataSource(DELETE_FILE, testSource);
}
- private AttributeResolver constructResolver(final int values) throws ComponentInitializationException {
+ private AttributeResolverImpl constructResolver(final int values) throws ComponentInitializationException {
return constructResolver(values, false);
}
- private AttributeResolver constructResolver(final int values, final boolean noSalt) throws ComponentInitializationException {
+ private AttributeResolverImpl constructResolver(final int values, final boolean noSalt) throws ComponentInitializationException {
final JDBCPairwiseIdStore store = new JDBCPairwiseIdStore();
store.setDataSource(testSource);
@@ -89,7 +89,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
* @throws ResolutionException if badness happens
*/
@Test(dependsOnMethods={"noSalt",}) public void storeEntry() throws ComponentInitializationException, SQLException, ResolutionException {
- final AttributeResolver resolver = constructResolver(1);
+ final AttributeResolverImpl resolver = constructResolver(1);
ComponentSupport.initialize(resolver);
@@ -118,7 +118,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
* @throws ResolutionException if badness happens
*/
@Test public void noSalt() throws ComponentInitializationException, SQLException, ResolutionException {
- final AttributeResolver resolver = constructResolver(1, true);
+ final AttributeResolverImpl resolver = constructResolver(1, true);
ComponentSupport.initialize(resolver);
ComputedIDDataConnectorTest.connectorFromResolver(resolver).initialize();
@@ -160,7 +160,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
*/
@Test(dependsOnMethods = {"storeEntry"}) void retrieveEntry() throws ComponentInitializationException,
IOException, ResolutionException {
- AttributeResolver resolver = constructResolver(1);
+ AttributeResolverImpl resolver = constructResolver(1);
ComputedIDDataConnectorTest.connectorFromResolver(resolver).initialize();
ComponentSupport.initialize(resolver);
@@ -218,7 +218,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final PairwiseIdDataConnector connector = new PairwiseIdDataConnector();
connector.setPairwiseIdStore(store);
- final AttributeResolver resolver = ComputedIDDataConnectorTest.constructResolverWithNonString(connector, "nonString");
+ final AttributeResolverImpl resolver = ComputedIDDataConnectorTest.constructResolverWithNonString(connector, "nonString");
ComponentSupport.initialize(resolver);
ComputedIDDataConnectorTest.connectorFromResolver(resolver).initialize();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 862f457..79a6440 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -46,7 +46,6 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.AbstractAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.MockAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.MockDataConnector;
@@ -137,7 +136,7 @@ public class AttributeResolverImplTest {
connectors.add(null);
connectors.add(new MockDataConnector("bar", (Map) null));
- final AttributeResolver resolver = newAttributeResolverImpl("foo", null, connectors);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", null, connectors);
assertNotNull(resolver.getDataConnectors());
assertEquals(resolver.getDataConnectors().size(), 2);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list