[java-identity-provider] 27/51: Rationalize test helper method names
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:58 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=52cc06bf42a29e67714fa44f8330390348430873
commit 52cc06bf42a29e67714fa44f8330390348430873
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 22 14:24:39 2019 +0000
Rationalize test helper method names
---
.../resolver/ad/impl/RegexAtributeTest.java | 10 ++++----
...SAML1NameIdentifierAttributeDefinitionTest.java | 18 ++++++-------
.../impl/SAML2NameIDAttributeDefinitionTest.java | 12 ++++-----
.../resolver/ad/impl/ScopedAttributeTest.java | 8 +++---
.../resolver/ad/impl/ScriptedAttributeTest.java | 12 ++++-----
.../resolver/ad/impl/SimpleAttributeTest.java | 12 ++++-----
.../resolver/ad/impl/TemplateAttributeTest.java | 30 +++++++++++-----------
.../ad/mapped/impl/MappedAttributeTest.java | 18 ++++++-------
.../dc/impl/ComputedIDDataConnectorTest.java | 22 ++++++++--------
.../resolver/impl/AttributeResolverImplTest.java | 28 ++++++++++----------
.../spring/ad/SimpleAttributeParserTest.java | 6 ++---
.../impl/TransientIdAttributeDefinitionTest.java | 8 +++---
.../net/shibboleth/idp/saml/impl/TestSources.java | 4 +--
.../idp/saml/nameid/impl/TransientDecoderTest.java | 2 +-
14 files changed, 95 insertions(+), 95 deletions(-)
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 e2a156b..31d6fc8 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
@@ -70,7 +70,7 @@ public class RegexAtributeTest {
// Set the dependency on the data connector
final Set<ResolverDataConnectorDependency> dependencySet = new LazySet<>();
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
dependencySet.add(depend);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -108,7 +108,7 @@ public class RegexAtributeTest {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
@@ -136,7 +136,7 @@ public class RegexAtributeTest {
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setRegularExpression(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
attrDef.setDataConnectorDependencies(Collections.singleton(depend));
attrDef.initialize();
@@ -152,7 +152,7 @@ public class RegexAtributeTest {
// Set the dependency on the data connector
final Set<ResolverDataConnectorDependency> dependencySet = new LazySet<>();
final ResolverDataConnectorDependency depend =
- TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
dependencySet.add(depend);
final RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -183,7 +183,7 @@ public class RegexAtributeTest {
RegexSplitAttributeDefinition attrDef = new RegexSplitAttributeDefinition();
final ResolverDataConnectorDependency depend =
- TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final Set<ResolverDataConnectorDependency> pluginDependencies = Collections.singleton(depend);
attrDef.setDataConnectorDependencies(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 177322b..62ab612 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
@@ -68,7 +68,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
@Test public void empty() throws ResolutionException, ComponentInitializationException {
final SAML1NameIdentifierAttributeDefinition defn = new SAML1NameIdentifierAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
final IdPAttribute result =
@@ -82,7 +82,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
defn.setId(TEST_ATTRIBUTE_NAME);
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setAttributeDependencies(dependencySet);
defn.initialize();
@@ -122,7 +122,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
attr.setValues(values);
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final SAML1NameIdentifierAttributeDefinition defn = new SAML1NameIdentifierAttributeDefinition();
@@ -161,11 +161,11 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
@Test public void nullIssuerID() throws ComponentInitializationException {
final SAML1NameIdentifierAttributeDefinition defn = new SAML1NameIdentifierAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setAttributeDependencies(dependencySet);
defn.initialize();
final Set<AttributeDefinition> am = new LazySet<>();
@@ -188,11 +188,11 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final SAML1NameIdentifierAttributeDefinition defn2 = new SAML1NameIdentifierAttributeDefinition();
defn2.setId(SECOND_ATTRIBUTE_NAME);
- defn2.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn2.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TEST_ATTRIBUTE_NAME));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TEST_ATTRIBUTE_NAME));
defn2.setAttributeDependencies(dependencySet);
defn2.initialize();
@@ -217,11 +217,11 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
@Test public void singleValueWithOptions() throws ResolutionException, ComponentInitializationException {
final SAML1NameIdentifierAttributeDefinition defn = new SAML1NameIdentifierAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setAttributeDependencies(dependencySet);
defn.setNameIdFormat(ALTERNATIVE_FORMAT);
defn.setNameIdQualifier(ALTERNATE_QUALIFIER);
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 4c6323e..0ee3c0c 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
@@ -71,7 +71,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
@Test public void testEmpty() throws ResolutionException, ComponentInitializationException {
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("bar")));
+ defn.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("bar")));
defn.initialize();
final IdPAttribute attr = new IdPAttribute("bar");
@@ -97,7 +97,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setAttributeDependencies(dependencySet);
defn.initialize();
@@ -142,7 +142,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final IdPAttribute attr = new IdPAttribute(ResolverTestSupport.EPA_ATTRIB_ID);
attr.setValues(values);
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
@@ -212,7 +212,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TEST_ATTRIBUTE_NAME));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TEST_ATTRIBUTE_NAME));
defn2.setAttributeDependencies(dependencySet);
defn2.initialize();
@@ -239,11 +239,11 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
ComponentInitializationException {
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("bar")));
+ defn.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("bar")));
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setAttributeDependencies(dependencySet);
defn.setNameIdFormat(ALTERNATIVE_FORMAT);
defn.setNameIdQualifier(ALTERNATE_QUALIFIER);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
index ce52775..a2c1ecf 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
@@ -71,7 +71,7 @@ public class ScopedAttributeTest {
// Set the dependency on the data connector
final Set<ResolverDataConnectorDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ dependencySet.add(TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
final ScopedAttributeDefinition scoped = new ScopedAttributeDefinition();
@@ -116,7 +116,7 @@ public class ScopedAttributeTest {
final ScopedAttributeDefinition attrDef = new ScopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setScope(TEST_SCOPE);
- attrDef.setDataConnectorDependencies(new HashSet<>(Arrays.asList(TestSources.makeResolverPluginDependency("connector1",
+ attrDef.setDataConnectorDependencies(new HashSet<>(Arrays.asList(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID))));
attrDef.initialize();
@@ -144,7 +144,7 @@ public class ScopedAttributeTest {
final ScopedAttributeDefinition attrDef = new ScopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
attrDef.setScope(TEST_SCOPE);
- attrDef.setDataConnectorDependencies(new HashSet<>(Arrays.asList(TestSources.makeResolverPluginDependency("connector1",
+ attrDef.setDataConnectorDependencies(new HashSet<>(Arrays.asList(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID))));
attrDef.initialize();
@@ -163,7 +163,7 @@ public class ScopedAttributeTest {
ScopedAttributeDefinition attrDef = new ScopedAttributeDefinition();
final Set<ResolverDataConnectorDependency> pluginDependencies =
- new HashSet<>(Arrays.asList(TestSources.makeResolverPluginDependency("connector1",
+ new HashSet<>(Arrays.asList(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
attrDef.setDataConnectorDependencies(pluginDependencies);
attrDef.setId(TEST_ATTRIBUTE_NAME);
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 6f23be8..957d899 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
@@ -353,7 +353,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("attributes.script")));
@@ -386,7 +386,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
scripted.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("work.script")));
@@ -433,7 +433,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
@@ -455,7 +455,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
@@ -500,7 +500,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverDataConnectorDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ ds.add(TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
@@ -543,7 +543,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
connector.setId("Connector");
final Set<ResolverDataConnectorDependency> ds =
- Collections.singleton(TestSources.makeResolverPluginDependency("Connector", null));
+ Collections.singleton(TestSources.makeDataConnectorDependency("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 6cdb79b..de8c498 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
@@ -66,7 +66,7 @@ public class SimpleAttributeTest {
} catch (final ComponentInitializationException e) {
//OK
}
- simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
simple.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -88,7 +88,7 @@ public class SimpleAttributeTest {
simple.setId(TEST_ATTRIBUTE_NAME);
final Set<ResolverDataConnectorDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ dependencySet.add(TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
simple.setDataConnectorDependencies(dependencySet);
simple.initialize();
@@ -129,7 +129,7 @@ public class SimpleAttributeTest {
// Set the dependency on the data connector
final Set<ResolverAttributeDefinitionDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
simple.setAttributeDependencies(dependencySet);
simple.initialize();
@@ -172,7 +172,7 @@ public class SimpleAttributeTest {
final AttributeResolutionContext resolutionContext =
ResolverTestSupport.buildResolutionContext(ResolverTestSupport.buildDataConnector("connector1", attr));
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(TEST_ATTRIBUTE_NAME);
@@ -201,9 +201,9 @@ public class SimpleAttributeTest {
simple.setId(TEST_ATTRIBUTE_NAME);
simple.setAttributeDependencies(Collections.singleton(
- TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
+ TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
simple.setDataConnectorDependencies(Collections.singleton(
- TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR)));
simple.initialize();
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 e38de45..ec82bd8 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
@@ -110,7 +110,7 @@ public class TemplateAttributeTest {
TemplateAttributeDefinition attr = new TemplateAttributeDefinition();
attr.setId(name);
Assert.assertNull(attr.getTemplate());
- attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
try {
attr.initialize();
Assert.fail("No template");
@@ -122,7 +122,7 @@ public class TemplateAttributeTest {
Assert.assertNull(attr.getTemplateText());
attr.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
Assert.assertNull(attr.getVelocityEngine());
- attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
try {
attr.initialize();
Assert.fail("engine");
@@ -142,7 +142,7 @@ public class TemplateAttributeTest {
}
Assert.assertNotNull(attr.getTemplateText());
- attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
attr.initialize();
Assert.assertNotNull(attr.getTemplate());
@@ -157,7 +157,7 @@ public class TemplateAttributeTest {
attr.setId(name);
attr.setVelocityEngine(getEngine());
attr.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
- attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
attr.setSourceAttributes(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
attr.initialize();
@@ -171,7 +171,7 @@ public class TemplateAttributeTest {
attr = new TemplateAttributeDefinition();
attr.setId(name);
attr.setVelocityEngine(getEngine());
- attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
+ attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
try {
attr.initialize();
Assert.fail("No Text or attributes");
@@ -202,7 +202,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_SIMPLE_TEMPLATE);
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setAttributeDependencies(ds);
templateDef.initialize();
@@ -265,13 +265,13 @@ public class TemplateAttributeTest {
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
if (setSources) {
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR+"2"));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR+"2"));
}
templateDef.setAttributeDependencies(ds);
templateDef.setDataConnectorDependencies(Collections.singleton(
- TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME)));
if (setSources) {
templateDef.setSourceAttributes(Arrays.asList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR,
@@ -312,7 +312,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText("Att ${at1}");
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setAttributeDependencies(ds);
templateDef.initialize();
@@ -353,8 +353,8 @@ public class TemplateAttributeTest {
final String otherAttrName = TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "2";
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
- ds.add(TestSources.makeResolverPluginDependency(otherAttrName));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(otherAttrName));
templateDef.setAttributeDependencies(ds);
templateDef.initialize();
@@ -385,8 +385,8 @@ public class TemplateAttributeTest {
final String otherAttrName = TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "2";
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
- ds.add(TestSources.makeResolverPluginDependency(otherAttrName));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(otherAttrName));
templateDef.setAttributeDependencies(ds);
templateDef.initialize();
@@ -411,7 +411,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
final Set<ResolverAttributeDefinitionDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setAttributeDependencies(ds);
templateDef.initialize();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
index be7d8b3..1726495 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
@@ -55,7 +55,7 @@ public class MappedAttributeTest {
}
final Set<ResolverDataConnectorDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
+ dependencySet.add(TestSources.makeDataConnectorDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
definition.setDataConnectorDependencies(dependencySet);
@@ -96,7 +96,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
"NoSuchAttribute")));
definition.setValueMaps(Collections.singleton(substringValueMapping("foo", false, "foo")));
definition.initialize();
@@ -115,7 +115,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
"NoSuchAttribute")));
definition.setValueMaps(Collections.singleton(substringValueMapping("foo", false, "foo")));
definition.setDefaultValue("");
@@ -140,7 +140,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
definition.setValueMaps(Collections.singleton(substringValueMapping("student", false, "student")));
definition.initialize();
@@ -163,7 +163,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
Assert.assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("student", false, "student")));
@@ -185,7 +185,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
Assert.assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("student", false, "student")));
@@ -209,7 +209,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
Assert.assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
@@ -236,7 +236,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
Assert.assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
@@ -273,7 +273,7 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("connector1",
+ definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
definition.setValueMaps(Collections.singleton(valueMap));
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 f4168a6..ce18092 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
@@ -85,7 +85,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
+ connector.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
testInit(connector, "No salt");
connector.setSalt(salt);
@@ -94,7 +94,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(OUTPUT_ATTRIBUTE_NAME);
- simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(TEST_CONNECTOR_NAME,
+ simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency(TEST_CONNECTOR_NAME,
TEST_ATTRIBUTE_NAME)));
final Set<AttributeDefinition> set = new HashSet<>(2);
@@ -123,7 +123,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
@Test public void getters() throws ComponentInitializationException {
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
+ connector.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
connector.setSalt(smallSalt);
connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
@@ -152,7 +152,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
protected static AttributeResolver constructResolver(final ComputedIDDataConnector connector, final int values, final boolean noSalt)
throws ComponentInitializationException {
connector.setId(TEST_CONNECTOR_NAME);
- connector.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
+ connector.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
if (!noSalt) {
@@ -161,7 +161,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(OUTPUT_ATTRIBUTE_NAME);
- simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(TEST_CONNECTOR_NAME,
+ simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency(TEST_CONNECTOR_NAME,
TEST_CONNECTOR_NAME)));
simple.initialize();
@@ -181,13 +181,13 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
protected static AttributeResolver constructResolverWithNonString(final ComputedIDDataConnector connector,
final String dependantOn) throws ComponentInitializationException {
connector.setId(TEST_CONNECTOR_NAME);
- connector.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(dependantOn)));
+ connector.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency(dependantOn)));
connector.setSalt(salt);
connector.setSourceAttributeId(dependantOn);
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(OUTPUT_ATTRIBUTE_NAME);
- simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(TEST_CONNECTOR_NAME,
+ simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency(TEST_CONNECTOR_NAME,
TEST_CONNECTOR_NAME)));
simple.initialize();
final Set<AttributeDefinition> set = new HashSet<>(3);
@@ -298,7 +298,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
+ connector.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency(
TestSources.STATIC_CONNECTOR_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR)));
connector.setSalt(salt);
connector.setGeneratedAttributeId("wibble");
@@ -310,7 +310,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
simple.setId(OUTPUT_ATTRIBUTE_NAME);
- simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(TEST_CONNECTOR_NAME,
+ simple.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency(TEST_CONNECTOR_NAME,
"wibble")));
simple.initialize();
@@ -345,7 +345,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
resolutionContext.setAttributeRecipientID(TestSources.SP_ENTITY_ID);
resolutionContext.setPrincipal(TestSources.PRINCIPAL_ID);
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
@@ -375,7 +375,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
resolutionContext.setAttributeRecipientID(TestSources.SP_ENTITY_ID);
resolutionContext.setPrincipal(TestSources.PRINCIPAL_ID);
- final ResolverDataConnectorDependency depend = TestSources.makeResolverPluginDependency("connector1", ResolverTestSupport.EPA_ATTRIB_ID);
+ final ResolverDataConnectorDependency depend = TestSources.makeDataConnectorDependency("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 2a4e47a..8c2276f 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
@@ -298,7 +298,7 @@ public class AttributeResolverImplTest {
dc1.initialize();
//
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", null);
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDataConnectorDependencies(Collections.singleton(dep1));
ad1.initialize();
@@ -330,7 +330,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", Collections.singletonMap("Atr", i1Val));
final SimpleAttributeDefinition ad = new SimpleAttributeDefinition();
ad.setId("output");
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1","Atr");
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1","Atr");
ad.setDataConnectorDependencies(Collections.singleton(dep1));
ad.initialize();
@@ -387,7 +387,7 @@ public class AttributeResolverImplTest {
dc1.setFailure(true);
dc1.initialize();
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", null);
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDataConnectorDependencies(Collections.singleton(dep1));
@@ -416,7 +416,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", (Map) null);
dc1.initialize();
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1", null);
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", null);
IdPAttribute attr = new IdPAttribute("test1");
attr.setValues(Collections.singletonList(new StringAttributeValue("value1")));
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", attr);
@@ -426,7 +426,7 @@ public class AttributeResolverImplTest {
attr = new IdPAttribute("test2");
attr.setValues(Collections.singletonList(new StringAttributeValue("value2")));
final MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", attr);
- ad2.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1", null)));
+ ad2.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("dc1", null)));
ad2.initialize();
LazySet<DataConnector> connectors = new LazySet<>();
@@ -490,7 +490,7 @@ public class AttributeResolverImplTest {
final MockDataConnector dc1 = new MockDataConnector("dc1", values);
dc1.initialize();
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1", "SubAttribute");
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", "SubAttribute");
attr = new IdPAttribute("test1");
attr.setValues(Collections.singletonList(new StringAttributeValue("value1")));
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", attr);
@@ -702,12 +702,12 @@ public class AttributeResolverImplTest {
/** Test that validation fails when a plugin depends on a non-existent plugin. */
@Test public void badPluginIdInitializeOld() throws Exception {
- final ResolverDataConnectorDependency dep1 = TestSources.makeResolverPluginDependency("dc1", "test");
+ final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", "test");
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setDataConnectorDependencies(Collections.singleton(dep1));
ad1.initialize();
- final ResolverAttributeDefinitionDependency dep2 = TestSources.makeResolverPluginDependency("ad1");
+ final ResolverAttributeDefinitionDependency dep2 = TestSources.makeAttributeDefinitionDependency("ad1");
MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
ad0.setAttributeDependencies(Collections.singleton(dep2));
ad0.initialize();
@@ -724,7 +724,7 @@ public class AttributeResolverImplTest {
// OK
}
- final ResolverAttributeDefinitionDependency dep3 = TestSources.makeResolverPluginDependency("ad0");
+ final ResolverAttributeDefinitionDependency dep3 = TestSources.makeAttributeDefinitionDependency("ad0");
ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
ad0.setAttributeDependencies(Collections.singleton(dep3));
definitions = new LazySet<>();
@@ -744,7 +744,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.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("ad1")));
+ ad1.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("ad1")));
LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
@@ -758,18 +758,18 @@ public class AttributeResolverImplTest {
// OK
}
- final MockDataConnector dc1 = new MockDataConnector("dc1", null, Collections.singleton(TestSources.makeResolverPluginDependency("ad0")), null);
+ final MockDataConnector dc1 = new MockDataConnector("dc1", null, Collections.singleton(TestSources.makeAttributeDefinitionDependency("ad0")), null);
ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
- ad1.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1")));
+ ad1.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("dc1")));
ad1.initialize();
final MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", new IdPAttribute("test"));
- ad2.setAttributeDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("dc1")));
+ ad2.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("dc1")));
ad2.initialize();
final MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", new IdPAttribute("test"));
- ad0.setAttributeDependencies(new HashSet<>(Arrays.asList(TestSources.makeResolverPluginDependency("ad1"), TestSources.makeResolverPluginDependency("ad2"))));
+ ad0.setAttributeDependencies(new HashSet<>(Arrays.asList(TestSources.makeAttributeDefinitionDependency("ad1"), TestSources.makeAttributeDefinitionDependency("ad2"))));
ad0.initialize();
final LazySet<DataConnector> connectors = new LazySet<>();
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
index 7ca613b..029cbfb 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
@@ -85,8 +85,8 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
Set<ResolverAttributeDefinitionDependency> adDeps = attrDef.getAttributeDependencies();
Assert.assertEquals(adDeps.size(), 2, "getAttributeDependencies");
- Assert.assertTrue(adDeps.contains(TestSources.makeResolverPluginDependency("dep2")));
- Assert.assertTrue(adDeps.contains(TestSources.makeResolverPluginDependency("dep3")));
+ Assert.assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep2")));
+ Assert.assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
Set<ResolverDataConnectorDependency> dcDeps = attrDef.getDataConnectorDependencies();
Assert.assertEquals(dcDeps.size(), 1, "getDataConnectorDependencies");
@@ -119,7 +119,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
final Set<ResolverAttributeDefinitionDependency> attrDeps = attrDef.getAttributeDependencies();
Assert.assertEquals(attrDeps.size(), 1, "getAttributeDependencies");
- Assert.assertTrue(attrDeps.contains(TestSources.makeResolverPluginDependency("dep3")));
+ Assert.assertTrue(attrDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
final Set<ResolverDataConnectorDependency> dcDeps = attrDef.getDataConnectorDependencies();
Assert.assertEquals(dcDeps.size(), 0, "getDataConnectorDependencies");
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/TransientIdAttributeDefinitionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/TransientIdAttributeDefinitionTest.java
index 1732158..0b00398 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/TransientIdAttributeDefinitionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/TransientIdAttributeDefinitionTest.java
@@ -67,7 +67,7 @@ public class TransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final TransientIdAttributeDefinition defn = newTransientIdAttributeDefinition(strategy);
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
@@ -105,7 +105,7 @@ public class TransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final TransientIdAttributeDefinition defn = newTransientIdAttributeDefinition(strategy);
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
try {
defn.resolve(TestSources.createResolutionContext(principal, idp, sp));
@@ -133,7 +133,7 @@ public class TransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
strategy.initialize();
final TransientIdAttributeDefinition defn = newTransientIdAttributeDefinition(strategy);
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
@@ -154,7 +154,7 @@ public class TransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final TransientIdAttributeDefinition defn = newTransientIdAttributeDefinition(strategy);
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
IdPAttribute result = defn.resolve(TestSources.createResolutionContext(TestSources.PRINCIPAL_ID,
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 83bbc28..eb30d59 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
@@ -210,12 +210,12 @@ public final class TestSources {
return retVal;
}
- public static ResolverAttributeDefinitionDependency makeResolverPluginDependency(String attributeId) {
+ public static ResolverAttributeDefinitionDependency makeAttributeDefinitionDependency(String attributeId) {
ResolverAttributeDefinitionDependency retVal = new ResolverAttributeDefinitionDependency(attributeId);
return retVal;
}
- public static ResolverDataConnectorDependency makeResolverPluginDependency(@Nonnull String connectorId, @Nullable String attributeId) {
+ public static ResolverDataConnectorDependency makeDataConnectorDependency(@Nonnull String connectorId, @Nullable String attributeId) {
ResolverDataConnectorDependency retVal = new ResolverDataConnectorDependency(connectorId);
if (null == attributeId) {
retVal.setAllAttributes(true);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/TransientDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/TransientDecoderTest.java
index 6a34e79..f25e3d8 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/TransientDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/TransientDecoderTest.java
@@ -139,7 +139,7 @@ public class TransientDecoderTest extends OpenSAMLInitBaseTestCase {
final TransientIdAttributeDefinition defn = TransientIdAttributeDefinitionTest.newTransientIdAttributeDefinition(strategy);
defn.setId("id");
- defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
defn.initialize();
final IdPAttribute result =
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list