[java-identity-provider] branch master updated: IDP-1121 Refactor test code away from old style dependencies.
Rod Widdowson
rdw at steadingsoftware.com
Sat Jan 5 09:36:05 EST 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=a31e5de5eb4792e2a14013ebb127c2897b78447f
The following commit(s) were added to refs/heads/master by this push:
new a31e5de IDP-1121 Refactor test code away from old style dependencies.
a31e5de is described below
commit a31e5de5eb4792e2a14013ebb127c2897b78447f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jan 5 14:33:47 2019 +0000
IDP-1121 Refactor test code away from old style dependencies.
https://issues.shibboleth.net/jira/browse/IDP-1121
The only code using the old Class is the code that tests that class.
---
.../resolver/AbstractResolverPluginTest.java | 4 +--
.../resolver/PluginDependencySupportTest.java | 2 +-
.../resolver/ResolvedAttributeDefinitionTest.java | 2 +-
.../resolver/ResolvedDataConnectorTest.java | 6 ++--
.../resolver/ad/impl/PrescopedAtributeTest.java | 33 ++++++++++----------
.../resolver/ad/impl/RegexAtributeTest.java | 22 ++++++--------
...SAML1NameIdentifierAttributeDefinitionTest.java | 5 ++--
.../impl/SAML2NameIDAttributeDefinitionTest.java | 3 +-
.../resolver/ad/impl/ScriptedAttributeTest.java | 5 ++--
.../resolver/ad/impl/SimpleAttributeTest.java | 3 +-
.../resolver/ad/impl/TemplateAttributeTest.java | 4 +--
.../dc/impl/ComputedIDDataConnectorTest.java | 6 ++--
.../resolver/impl/AttributeResolverImplTest.java | 35 +++++++++++-----------
.../net/shibboleth/idp/saml/impl/TestSources.java | 16 +++++-----
14 files changed, 68 insertions(+), 78 deletions(-)
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
index 68834cc..e9c901d 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
@@ -101,9 +101,9 @@ public class AbstractResolverPluginTest {
Assert.assertNotNull(plugin.getDependencies());
Assert.assertTrue(plugin.getDependencies().isEmpty());
- ResolverPluginDependency dep1 = new ResolverPluginDependency("foo");
+ ResolverPluginDependency dep1 = new ResolverAttributeDefinitionDependency("foo");
dep1.setDependencyAttributeId("bar");
- ResolverPluginDependency dep2 = new ResolverPluginDependency("foo");
+ ResolverPluginDependency dep2 = new ResolverAttributeDefinitionDependency("foo");
dep2.setDependencyAttributeId("baz");
depdencies.add(dep1);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
index 62b8b15..de3effe 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
@@ -63,7 +63,7 @@ public class PluginDependencySupportTest {
final List<IdPAttributeValue<?>> result =
PluginDependencySupport.getMergedAttributeValues(workContext,
- Collections.singletonList(new ResolverPluginDependency(ResolverTestSupport.EPA_ATTRIB_ID)),
+ Collections.singletonList((ResolverPluginDependency) new ResolverAttributeDefinitionDependency(ResolverTestSupport.EPA_ATTRIB_ID)),
ResolverTestSupport.EPA_ATTRIB_ID);
Assert.assertNotNull(result);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
index 01b1c80..1f15dcd 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
@@ -93,7 +93,7 @@ public class ResolvedAttributeDefinitionTest {
MockStaticAttributeDefinition attrDef = new MockStaticAttributeDefinition();
attrDef.setValue(attribute);
attrDef.setId("Defn");
- ResolverPluginDependency dep = new ResolverPluginDependency("doo");
+ ResolverPluginDependency dep = new ResolverAttributeDefinitionDependency("doo");
dep.setDependencyAttributeId("foo");
attrDef.setDependencies(Collections.singleton(dep));
attrDef.setPropagateResolutionExceptions(false);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
index d1cacb2..34dd4de 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
@@ -97,9 +97,9 @@ public class ResolvedDataConnectorTest {
MockStaticDataConnector dc = new MockStaticDataConnector();
dc.setValues(Arrays.asList(new IdPAttribute("attr")));
dc.setId("Defn");
- ResolverPluginDependency dep = new ResolverPluginDependency("doo");
- dep.setDependencyAttributeId("foo");
- dc.setDependencies(Collections.singleton(dep));
+ ResolverDataConnectorDependency dep = new ResolverDataConnectorDependency("doo");
+ dep.setAttributeNames(Collections.singletonList("foo"));
+ dc.setDependencies(Collections.singleton((ResolverPluginDependency) dep));
dc.setPropagateResolutionExceptions(false);
dc.initialize();
ResolvedDataConnector resolvedDataConnector = new ResolvedDataConnector(dc, resolvedData);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
index 746e878..fdf758b 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
@@ -33,6 +33,7 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
import net.shibboleth.idp.attribute.resolver.ResolverTestSupport;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
@@ -51,6 +52,7 @@ import org.testng.annotations.Test;
/**
* Test for prescoped attribute definitions.
*/
+ at SuppressWarnings("deprecation")
public class PrescopedAtributeTest {
/** The name. resolve to */
private static final String TEST_ATTRIBUTE_NAME = "prescoped";
@@ -68,8 +70,8 @@ public class PrescopedAtributeTest {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- final ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME);
+ depend.setAttributeNames(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
dependencySet.add(depend);
final PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -106,8 +108,8 @@ public class PrescopedAtributeTest {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- final ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME);
+ depend.setAttributeNames(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
dependencySet.add(depend);
final PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -144,9 +146,9 @@ public class PrescopedAtributeTest {
final PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setScopeDelimiter("@");
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
- attrDef.setDependencies(Collections.singleton(depend));
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency("connector1");
+ depend.setAttributeNames(Collections.singletonList(ResolverTestSupport.EPA_ATTRIB_ID));
+ attrDef.setDependencies(Collections.singleton((ResolverPluginDependency) depend));
attrDef.initialize();
try {
@@ -169,13 +171,14 @@ public class PrescopedAtributeTest {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency("connector1");
+ depend.setAttributeNames(Collections.singletonList(ResolverTestSupport.EPA_ATTRIB_ID));
final PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setScopeDelimiter("@");
- attrDef.setDependencies(Collections.singleton(depend));
+ attrDef.setDependencies(Collections.singleton((ResolverPluginDependency) depend));
attrDef.initialize();
final IdPAttribute result = attrDef.resolve(resolutionContext);
@@ -191,8 +194,8 @@ public class PrescopedAtributeTest {
@Test public void emptyValueType() throws ResolutionException, ComponentInitializationException {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- final ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME);
+ depend.setAttributeNames(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
dependencySet.add(depend);
final PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -224,9 +227,9 @@ public class PrescopedAtributeTest {
@Test public void initDestroyParms() throws ResolutionException, ComponentInitializationException {
PrescopedAttributeDefinition attrDef = new PrescopedAttributeDefinition();
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
- final Set<ResolverPluginDependency> pluginDependencies = Collections.singleton(depend);
+ final ResolverDataConnectorDependency depend = new ResolverDataConnectorDependency("connector1");
+ depend.setAttributeNames(Collections.singletonList(ResolverTestSupport.EPA_ATTRIB_ID));
+ final Set<ResolverPluginDependency> pluginDependencies = Collections.singleton((ResolverPluginDependency)depend);
attrDef.setDependencies(pluginDependencies);
attrDef.setId(TEST_ATTRIBUTE_NAME);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
index 6e5d17b..30fe0f6 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
@@ -24,6 +24,9 @@ import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
@@ -46,12 +49,10 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for regex attribute definitions.
*/
+ at SuppressWarnings("deprecation")
public class RegexAtributeTest {
/** The name. */
@@ -68,8 +69,7 @@ public class RegexAtributeTest {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- final ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
dependencySet.add(depend);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -107,8 +107,7 @@ public class RegexAtributeTest {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
@@ -136,8 +135,7 @@ public class RegexAtributeTest {
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setRegularExpression(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
attrDef.setDependencies(Collections.singleton(depend));
attrDef.initialize();
@@ -152,8 +150,7 @@ public class RegexAtributeTest {
@Test public void emptyValueType() throws ResolutionException, ComponentInitializationException {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- final ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
dependencySet.add(depend);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -183,8 +180,7 @@ public class RegexAtributeTest {
@Test public void initDestroyParms() throws ResolutionException, ComponentInitializationException {
RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final Set<ResolverPluginDependency> pluginDependencies = Collections.singleton(depend);
attrDef.setDependencies(pluginDependencies);
attrDef.setId(TEST_ATTRIBUTE_NAME);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
index 8d3e1e7..8095e1b 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
@@ -120,8 +120,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
attr.setValues(values);
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final SAML1NameIdentifierAttributeDefinition defn = new SAML1NameIdentifierAttributeDefinition();
@@ -191,7 +190,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(new ResolverPluginDependency(TEST_ATTRIBUTE_NAME));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TEST_ATTRIBUTE_NAME));
defn2.setDependencies(dependencySet);
defn2.initialize();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
index 7efb8b4..edcb6a2 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
@@ -140,8 +140,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
attr.setValues(values);
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
index 7bcf045..410c3cb 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
@@ -432,8 +432,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
@@ -543,7 +542,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
connector.setId("Connector");
final Set<ResolverPluginDependency> ds =
- Collections.singleton(TestSources.makeResolverPluginDependency("Connector", true));
+ Collections.singleton(TestSources.makeResolverPluginDependency("Connector", null));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(attributeName);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
index 3a83736..963fa21 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
@@ -170,8 +170,7 @@ public class SimpleAttributeTest {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(TEST_ATTRIBUTE_NAME);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
index ae8bf20..9b4500e 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
@@ -201,7 +201,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_SIMPLE_TEMPLATE);
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(new ResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setDependencies(ds);
templateDef.initialize();
@@ -266,7 +266,7 @@ public class TemplateAttributeTest {
ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
if (setSources) {
- ds.add(new ResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR+"2"));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR+"2"));
}
ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME));
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 7978191..4a3ba82 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
@@ -344,8 +344,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
resolutionContext.setAttributeRecipientID(TestSources.SP_ENTITY_ID);
resolutionContext.setPrincipal(TestSources.PRINCIPAL_ID);
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
@@ -375,8 +374,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
resolutionContext.setAttributeRecipientID(TestSources.SP_ENTITY_ID);
resolutionContext.setPrincipal(TestSources.PRINCIPAL_ID);
- final ResolverPluginDependency depend = new ResolverPluginDependency("connector1");
- depend.setDependencyAttributeId(ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverPluginDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
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 3008085..dd10d34 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
@@ -52,6 +52,7 @@ import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
import net.shibboleth.idp.attribute.resolver.ad.impl.SimpleAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
+import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.collection.LazySet;
@@ -259,8 +260,8 @@ public class AttributeResolverImplTest {
final MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", attr);
- final ResolverPluginDependency dep2 = new ResolverPluginDependency("ad1");
- final ResolverPluginDependency dep3 = new ResolverPluginDependency("ad2");
+ final ResolverPluginDependency dep2 = TestSources.makeResolverPluginDependency("ad1");
+ final ResolverPluginDependency dep3 = TestSources.makeResolverPluginDependency("ad2");
final MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", attr);
ad0.setDependencies(new HashSet<>(Arrays.asList(dep2, dep3)));
ad0.initialize();
@@ -337,7 +338,7 @@ public class AttributeResolverImplTest {
dc1.initialize();
//
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDependencies(Collections.singleton(dep1));
ad1.initialize();
@@ -369,8 +370,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", Collections.singletonMap("Atr", i1Val));
final SimpleAttributeDefinition ad = new SimpleAttributeDefinition();
ad.setId("output");
- ad.setSourceAttributeId("Atr");
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1","Atr");
ad.setDependencies(Collections.singleton(dep1));
ad.initialize();
@@ -427,7 +427,7 @@ public class AttributeResolverImplTest {
dc1.setFailure(true);
dc1.initialize();
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDependencies(Collections.singleton(dep1));
@@ -456,7 +456,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", (Map) null);
dc1.initialize();
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
IdPAttribute attr = new IdPAttribute("test1");
attr.setValues(Collections.singletonList(new StringAttributeValue("value1")));
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", attr);
@@ -466,7 +466,7 @@ public class AttributeResolverImplTest {
attr = new IdPAttribute("test2");
attr.setValues(Collections.singletonList(new StringAttributeValue("value2")));
final MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", attr);
- ad2.setDependencies(Collections.singleton(new ResolverPluginDependency("dc1")));
+ ad2.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1", null)));
ad2.initialize();
LazySet<DataConnector> connectors = new LazySet<>();
@@ -528,8 +528,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", values);
dc1.initialize();
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
- dep1.setDependencyAttributeId("SubAttribute");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1", "SubAttribute");
attr = new IdPAttribute("test1");
attr.setValues(Collections.singletonList(new StringAttributeValue("value1")));
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", attr);
@@ -741,12 +740,12 @@ public class AttributeResolverImplTest {
/** Test that validation fails when a plugin depends on a non-existent plugin. */
@Test public void badPluginIdInitializeOld() throws Exception {
- final ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1");
+ final ResolverPluginDependency dep1 = TestSources.makeResolverPluginDependency("dc1", "test");
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDependencies(Collections.singleton(dep1));
ad1.initialize();
- final ResolverPluginDependency dep2 = new ResolverPluginDependency("ad1");
+ final ResolverPluginDependency dep2 = TestSources.makeResolverPluginDependency("ad1");
MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
ad0.setDependencies(Collections.singleton(dep2));
ad0.initialize();
@@ -763,7 +762,7 @@ public class AttributeResolverImplTest {
// OK
}
- final ResolverPluginDependency dep3 = new ResolverPluginDependency("ad0");
+ final ResolverPluginDependency dep3 = TestSources.makeResolverPluginDependency("ad0");
ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
ad0.setDependencies(Collections.singleton(dep3));
definitions = new LazySet<>();
@@ -783,7 +782,7 @@ public class AttributeResolverImplTest {
/** Test that validation fails when there are circular dependencies between plugins. */
@Test public void circularDependencyInitializeOld() throws Exception {
MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
- ad1.setDependencies(Collections.singleton(new ResolverPluginDependency("ad1")));
+ ad1.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("ad1")));
LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
@@ -797,18 +796,18 @@ public class AttributeResolverImplTest {
// OK
}
- final MockDataConnector dc1 = new MockDataConnector("dc1", null, Collections.singleton(new ResolverPluginDependency("ad0")));
+ final MockDataConnector dc1 = new MockDataConnector("dc1", null, Collections.singleton(TestSources.makeResolverPluginDependency("ad0")));
ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
- ad1.setDependencies(Collections.singleton(new ResolverPluginDependency("dc1")));
+ ad1.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1")));
ad1.initialize();
final MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", new IdPAttribute("test"));
- ad2.setDependencies(Collections.singleton(new ResolverPluginDependency("dc1")));
+ ad2.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1")));
ad2.initialize();
final MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
- ad0.setDependencies(new HashSet<>(Arrays.asList(new ResolverPluginDependency("ad1"), new ResolverPluginDependency("ad2"))));
+ ad0.setDependencies(new HashSet<>(Arrays.asList(TestSources.makeResolverPluginDependency("ad1"), TestSources.makeResolverPluginDependency("ad2"))));
ad0.initialize();
final LazySet<DataConnector> connectors = new LazySet<>();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java
index eb6e214..317e9e4 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java
@@ -216,18 +216,16 @@ public final class TestSources {
return retVal;
}
- public static ResolverPluginDependency makeResolverPluginDependency(String connectorId, String attributeId) {
+ public static ResolverPluginDependency makeResolverPluginDependency(@Nonnull String connectorId, @Nullable String attributeId) {
ResolverDataConnectorDependency retVal = new ResolverDataConnectorDependency(connectorId);
- retVal.setAttributeNames(Collections.singleton(attributeId));
- return retVal;
+ if (null == attributeId) {
+ retVal.setAllAttributes(true);
+ } else {
+ retVal.setAttributeNames(Collections.singleton(attributeId));
+ }
+ return retVal;
}
- public static ResolverPluginDependency makeResolverPluginDependency(String connectorId, boolean allAttributes) {
- ResolverDataConnectorDependency retVal = new ResolverDataConnectorDependency(connectorId);
- retVal.setAllAttributes(allAttributes);
- return retVal;
- }
-
@SuppressWarnings("unused")
private static class StaticAttributeDefinition extends AbstractAttributeDefinition {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list