[java-identity-provider] 01/03: Remove use of old style dependencies from tests
Rod Widdowson
rdw at steadingsoftware.com
Wed Nov 21 05:24:05 EST 2018
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=e9086e730e57a5ba1f0d66e9c84e7da61072d73d
commit e9086e730e57a5ba1f0d66e9c84e7da61072d73d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 20 16:55:44 2018 +0000
Remove use of old style dependencies from tests
---
...SAML1NameIdentifierAttributeDefinitionTest.java | 12 ++----
.../impl/SAML2NameIDAttributeDefinitionTest.java | 29 ++++++++------
.../resolver/ad/impl/ScriptedAttributeTest.java | 12 +++---
.../resolver/ad/impl/SimpleAttributeTest.java | 6 +--
.../resolver/ad/impl/TemplateAttributeTest.java | 33 ++++++----------
.../dc/impl/ComputedIDDataConnectorTest.java | 26 ++++++-------
.../dc/impl/StoredIDDataConnectorTest.java | 8 ++--
.../attribute/resolver/impl/ad/attributes2.script | 2 +-
.../spring/ad/SimpleAttributeParserTest.java | 24 ++++--------
.../ad/resolver/simpleAttributePopulated.xml | 6 +--
.../{ => resolver}/simpleAttributePopulated2.xml | 5 +--
.../spring/ad/simpleAttributePopulated.xml | 28 --------------
.../net/shibboleth/idp/saml/impl/TestSources.java | 45 ++++++++++++++--------
13 files changed, 98 insertions(+), 138 deletions(-)
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 197a479..fc3cf97 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
@@ -80,8 +80,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
defn.setId(TEST_ATTRIBUTE_NAME);
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setDependencies(dependencySet);
defn.initialize();
@@ -165,8 +164,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setDependencies(dependencySet);
defn.initialize();
final Set<AttributeDefinition> am = new LazySet<>();
@@ -222,8 +220,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setDependencies(dependencySet);
defn.setNameIdFormat(ALTERNATIVE_FORMAT);
defn.setNameIdQualifier(ALTERNATE_QUALIFIER);
@@ -232,8 +229,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
// And resolve
final Set<AttributeDefinition> am = new LazySet<>();
am.add(defn);
- am.add(TestSources.populatedStaticAttribute(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
+ am.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
resolver.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 2c91fcb..55cd60e 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
@@ -33,6 +33,7 @@ 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.ResolvedAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
import net.shibboleth.idp.attribute.resolver.ResolverTestSupport;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
@@ -68,12 +69,21 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
@Test public void testEmpty() throws ResolutionException, ComponentInitializationException {
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("bar")));
defn.initialize();
- final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getSubcontext(AttributeResolverWorkContext.class, true);
+ final IdPAttribute attr = new IdPAttribute("bar");
+ final Collection<? extends IdPAttributeValue<?>> values = Collections.emptyList();
+ attr.setValues(values);
+ final StaticAttributeDefinition sa = new StaticAttributeDefinition();
+ sa.setId(attr.getId());
+ sa.setValue(attr);
+ sa.initialize();
+
+ final AttributeResolutionContext context = new AttributeResolutionContext();
+ context.getSubcontext(AttributeResolverWorkContext.class, true).recordAttributeDefinitionResolution(sa,attr);
+
final IdPAttribute result = defn.resolve(context);
Assert.assertTrue(result.getValues().isEmpty());
@@ -85,8 +95,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setDependencies(dependencySet);
defn.initialize();
@@ -202,7 +211,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TEST_ATTRIBUTE_NAME, null));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TEST_ATTRIBUTE_NAME));
defn2.setDependencies(dependencySet);
defn2.initialize();
@@ -229,12 +238,11 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
ComponentInitializationException {
final SAML2NameIDAttributeDefinition defn = new SAML2NameIDAttributeDefinition();
defn.setId(TEST_ATTRIBUTE_NAME);
- defn.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("foo", "bar")));
+ defn.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency("bar")));
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
defn.setDependencies(dependencySet);
defn.setNameIdFormat(ALTERNATIVE_FORMAT);
defn.setNameIdQualifier(ALTERNATE_QUALIFIER);
@@ -244,8 +252,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
// And resolve
final Set<AttributeDefinition> am = new LazySet<>();
am.add(defn);
- am.add(TestSources.populatedStaticAttribute(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
+ am.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
resolver.initialize();
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 03ef4e9..316277d 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
@@ -352,8 +352,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(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,8 +385,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(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")));
@@ -457,7 +455,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, null));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME));
final ScriptedAttributeDefinition scripted = new ScriptedAttributeDefinition();
scripted.setId(TEST_ATTRIBUTE_NAME);
@@ -469,7 +467,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final Set<AttributeDefinition> attrDefinitions = new HashSet<>(3);
attrDefinitions.add(scripted);
final AttributeDefinition nonString =
- TestSources.nonStringAttributeDefiniton(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ TestSources.nonStringAttributeDefiniton(TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME);
attrDefinitions.add(nonString);
attrDefinitions.add(TestSources.populatedStaticAttribute());
@@ -545,7 +543,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
connector.setId("Connector");
final Set<ResolverPluginDependency> ds =
- Collections.singleton(TestSources.makeResolverPluginDependency("Connector", null));
+ Collections.singleton(TestSources.makeResolverPluginDependency("Connector", true));
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 d3cba7d..2753aa7 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
@@ -127,8 +127,7 @@ public class SimpleAttributeTest {
// Set the dependency on the data connector
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
simple.setDependencies(dependencySet);
simple.initialize();
@@ -201,8 +200,7 @@ public class SimpleAttributeTest {
simple.setId(TEST_ATTRIBUTE_NAME);
final Set<ResolverPluginDependency> dependencySet = new LazySet<>();
- dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
dependencySet.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR));
simple.setDependencies(dependencySet);
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 06bf607..d895086 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
@@ -200,9 +200,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_SIMPLE_TEMPLATE);
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(new ResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME));
- // ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR,
- // TestSources.STATIC_ATTRIBUTE_NAME));
+ ds.add(new ResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setDependencies(ds);
templateDef.setSourceAttributes(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.initialize();
@@ -242,8 +240,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_CONNECTOR);
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_CONNECTOR_NAME,
TestSources.DEPENDS_ON_SECOND_ATTRIBUTE_NAME));
templateDef.setDependencies(ds);
@@ -283,8 +280,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText("Att ${at1}");
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setDependencies(ds);
templateDef.setSourceAttributes(Arrays.asList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.initialize();
@@ -295,7 +291,7 @@ public class TemplateAttributeTest {
final IdPAttribute attr = new IdPAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
attr.setValues(values);
final StaticAttributeDefinition simple = new StaticAttributeDefinition();
- simple.setId(TestSources.STATIC_ATTRIBUTE_NAME);
+ simple.setId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
simple.setValue(attr);
simple.initialize();
@@ -323,13 +319,11 @@ public class TemplateAttributeTest {
templateDef.setId(name);
templateDef.setVelocityEngine(getEngine());
templateDef.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_CONNECTOR);
- final String otherDefName = TestSources.STATIC_ATTRIBUTE_NAME + "2";
final String otherAttrName = TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "2";
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
- ds.add(TestSources.makeResolverPluginDependency(otherDefName, otherAttrName));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(otherAttrName));
templateDef.setDependencies(ds);
templateDef.setSourceAttributes(Arrays.asList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, otherAttrName));
templateDef.initialize();
@@ -337,7 +331,7 @@ public class TemplateAttributeTest {
final Set<AttributeDefinition> attrDefinitions = new LazySet<>();
attrDefinitions.add(templateDef);
attrDefinitions.add(TestSources.populatedStaticAttribute());
- attrDefinitions.add(TestSources.populatedStaticAttribute(otherDefName, otherAttrName, 1));
+ attrDefinitions.add(TestSources.populatedStaticAttribute(otherAttrName, 1));
final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
resolver.initialize();
@@ -358,13 +352,11 @@ public class TemplateAttributeTest {
templateDef.setId(name);
templateDef.setVelocityEngine(getEngine());
templateDef.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_CONNECTOR);
- final String otherDefName = TestSources.STATIC_ATTRIBUTE_NAME + "2";
final String otherAttrName = TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "2";
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
- ds.add(TestSources.makeResolverPluginDependency(otherDefName, otherAttrName));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(otherAttrName));
templateDef.setDependencies(ds);
templateDef.setSourceAttributes(Arrays.asList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, otherAttrName));
templateDef.initialize();
@@ -372,7 +364,7 @@ public class TemplateAttributeTest {
final Set<AttributeDefinition> attrDefinitions = new LazySet<>();
attrDefinitions.add(templateDef);
attrDefinitions.add(TestSources.populatedStaticAttribute());
- attrDefinitions.add(TestSources.populatedStaticAttribute(otherDefName, otherAttrName, 0));
+ attrDefinitions.add(TestSources.populatedStaticAttribute(otherAttrName, 0));
final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
resolver.initialize();
@@ -390,8 +382,7 @@ public class TemplateAttributeTest {
templateDef.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
final Set<ResolverPluginDependency> ds = new LazySet<>();
- ds.add(TestSources.makeResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
+ ds.add(TestSources.makeResolverPluginDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
templateDef.setDependencies(ds);
templateDef.setSourceAttributes(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
@@ -400,7 +391,7 @@ public class TemplateAttributeTest {
final IdPAttribute attr = new IdPAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
attr.setValues(Collections.singletonList(new ByteAttributeValue(new byte[] {1, 2, 3})));
final StaticAttributeDefinition simple = new StaticAttributeDefinition();
- simple.setId(TestSources.STATIC_ATTRIBUTE_NAME);
+ simple.setId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
simple.setValue(attr);
simple.initialize();
final Set<AttributeDefinition> attrDefinitions = new LazySet<>();
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 1da9af7..f2ca8c0 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,11 +85,9 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
connector.setId(TEST_CONNECTOR_NAME);
connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
- TestSources.STATIC_ATTRIBUTE_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
+ TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
testInit(connector, "No salt");
connector.setSalt(salt);
- testInit(connector, "No source attr");
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
connector.initialize();
@@ -100,8 +98,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final Set<AttributeDefinition> set = new HashSet<>(2);
set.add(simple);
- set.add(TestSources.populatedStaticAttribute(TestSources.STATIC_ATTRIBUTE_NAME,
- TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
+ set.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
final AttributeResolverImpl resolver =
AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector), null);
@@ -126,9 +123,9 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
- TestSources.STATIC_ATTRIBUTE_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
+ TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
connector.setSalt(smallSalt);
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
Assert.assertEquals(connector.getSalt(), smallSalt);
testInit(connector, "Small salt");
@@ -155,8 +152,8 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
throws ComponentInitializationException {
connector.setId(TEST_CONNECTOR_NAME);
connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
- TestSources.STATIC_ATTRIBUTE_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
if (!noSalt) {
connector.setSalt(salt);
}
@@ -169,7 +166,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final Set<AttributeDefinition> set = new HashSet<>(2);
set.add(simple);
- set.add(TestSources.populatedStaticAttribute(TestSources.STATIC_ATTRIBUTE_NAME,
+ set.add(TestSources.populatedStaticAttribute(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, values));
return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector), null);
@@ -183,7 +180,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
protected static AttributeResolver constructResolverWithNonString(final ComputedIDDataConnector connector,
final String dependantOn) throws ComponentInitializationException {
connector.setId(TEST_CONNECTOR_NAME);
- connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(dependantOn, null)));
+ connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(dependantOn)));
connector.setSalt(salt);
connector.setSourceAttributeId(dependantOn);
@@ -194,7 +191,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
simple.initialize();
final Set<AttributeDefinition> set = new HashSet<>(3);
set.add(simple);
- set.add(TestSources.populatedStaticAttribute(TestSources.STATIC_ATTRIBUTE_NAME,
+ set.add(TestSources.populatedStaticAttribute(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
set.add(TestSources.nonStringAttributeDefiniton(dependantOn));
@@ -263,7 +260,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
@Test public void attributeFails() throws ComponentInitializationException, ResolutionException {
AttributeResolver resolver = constructResolver(3);
- connectorFromResolver(resolver).setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME + "1");
+ connectorFromResolver(resolver).setSourceAttributeId(/*TestSources.STATIC_ATTRIBUTE_NAME + */ "1");
connectorFromResolver(resolver).initialize();
ComponentSupport.initialize(resolver);
@@ -301,8 +298,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final ComputedIDDataConnector connector = new ComputedIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
- TestSources.STATIC_CONNECTOR_NAME, null)));
- connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR);
+ TestSources.STATIC_CONNECTOR_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_CONNECTOR)));
connector.setSalt(salt);
connector.setGeneratedAttributeId("wibble");
connector.initialize();
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 435c231..d58f186 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
@@ -89,19 +89,19 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
StoredIDDataConnector connector = new StoredIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
tryInitialize(connector, "No DataSource");
connector = new StoredIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
connector.setDataSource(testSource);
connector = new StoredIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
connector.setDataSource(testSource);
connector.setSalt(ComputedIDDataConnectorTest.smallSalt);
@@ -109,7 +109,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
connector = new StoredIDDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
- connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
+ connector.setSourceAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
connector.setGeneratedAttributeId(TEST_ATTRIBUTE_NAME);
connector.setDataSource(testSource);
connector.setSalt(ComputedIDDataConnectorTest.smallSalt);
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
index c865d33..2a8db2d 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
@@ -1,4 +1,4 @@
-values = at1.getValues().iterator();
+values = at2.getValues().iterator();
val = values.next();
Scripted.addValue(val);
if (values.hasNext()) {
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 e8c2da3..ad6fb3a 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
@@ -62,19 +62,9 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
Assert.assertTrue(attrDef.getAttributeEncoders().isEmpty(), "getgetAttributeEncoders().isEmpty()");
}
- @Test public void populated() throws ComponentInitializationException {
+ @Test public void simplePopulated() throws ComponentInitializationException {
final AttributeDefinition attrDef =
- getAttributeDefn("simpleAttributePopulated.xml", SimpleAttributeDefinition.class);
- valuesPopulated(attrDef);
- }
-
- @Test public void resolver() throws ComponentInitializationException {
- final AttributeDefinition attrDef =
- getAttributeDefn("simpleAttributePopulated.xml", SimpleAttributeDefinition.class);
- valuesPopulated(attrDef);
- }
-
- private void valuesPopulated(AttributeDefinition attrDef) throws ComponentInitializationException {
+ getAttributeDefn("resolver/simpleAttributePopulated.xml", SimpleAttributeDefinition.class);
attrDef.initialize();
@@ -94,9 +84,9 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
Set<ResolverPluginDependency> dependencies = attrDef.getDependencies();
Assert.assertEquals(dependencies.size(), 3, "getDisplayDescriptions");
- Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep1", "flibble")));
- Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep2", "flibble")));
- Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3", "flibble")));
+ Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("con1", "dep1")));
+ Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep2")));
+ Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3")));
Assert.assertEquals(attrDef.getAttributeEncoders().size(), 1);
final SAML2StringAttributeEncoder e1 =
@@ -108,7 +98,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
@Test public void populated2() throws ComponentInitializationException {
AttributeDefinition attrDef =
- getAttributeDefn("simpleAttributePopulated2.xml", SimpleAttributeDefinition.class);
+ getAttributeDefn("resolver/simpleAttributePopulated2.xml", SimpleAttributeDefinition.class);
attrDef.initialize();
@@ -123,7 +113,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
Set<ResolverPluginDependency> dependencies = attrDef.getDependencies();
Assert.assertEquals(dependencies.size(), 1, "getDisplayDescriptions");
- Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3", null)));
+ Assert.assertTrue(dependencies.contains(TestSources.makeResolverPluginDependency("dep3")));
Assert.assertEquals(attrDef.getAttributeEncoders().size(), 2);
List a = new ArrayList(attrDef.getAttributeEncoders());
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
index f5a8709..dc20a41 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
@@ -5,12 +5,12 @@
xsi:type="Simple" id="simplePopulated" sourceAttributeID="flibble"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <Dependency ref="dep2"/>
+ <InputAttributeDefinition ref="dep2"/>
<DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
- <Dependency ref="dep1"/>
+ <InputDataConnector ref="con1" attributeNames="dep1"/>
<DisplayName xml:lang="en">NameInEnglish</DisplayName>
- <Dependency ref="dep3"/>
+ <InputAttributeDefinition ref="dep3"/>
<DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
similarity index 89%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
index d00942f..9f6d2d5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
@@ -1,10 +1,9 @@
<AttributeDefinition
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
dependencyOnly="false"
- xsi:type="ad:Simple" id="simplePopulated2"
+ xsi:type="Simple" id="simplePopulated2"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
@@ -13,7 +12,7 @@
urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <Dependency ref="dep3"/>
+ <InputAttributeDefinition ref="dep3"/>
<DisplayName xml:lang="en">NameInAmerican</DisplayName>
<AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
<AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
deleted file mode 100644
index e37a60e..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
+++ /dev/null
@@ -1,28 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Simple" id="simplePopulated" sourceAttributeID="flibble"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <Dependency ref="dep2"/>
- <Dependency ref="dep1"/>
- <Dependency ref="dep3"/>
-
- <DisplayName xml:lang="en">NameInEnglish</DisplayName>
- <DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
-
- <DisplayDescription xml:lang="en">DescInEnglish</DisplayDescription>
- <DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
-
- <DisplayDescription xml:lang="fr">DescEnFrancais</DisplayDescription>
-
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
- </AttributeDefinition>
\ No newline at end of file
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 6e9057f..fbd711c 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
@@ -36,8 +36,10 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.AbstractAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.DataConnector;
+import net.shibboleth.idp.attribute.resolver.DataConnectorEx;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
@@ -58,8 +60,6 @@ public final class TestSources {
/** The name we use in this test for the static connector. */
public static final String STATIC_CONNECTOR_NAME = "staticCon";
- /** The name we use in this test for the static attribute. */
- public static final String STATIC_ATTRIBUTE_NAME = "staticAtt";
/** The name of the attribute we use as source. */
public static final String DEPENDS_ON_ATTRIBUTE_NAME_ATTR = "at1";
@@ -129,7 +129,7 @@ public final class TestSources {
* @return The connector
* @throws ComponentInitializationException if we cannot initialized (unlikely)
*/
- public static DataConnector populatedStaticConnector() throws ComponentInitializationException {
+ public static DataConnectorEx populatedStaticConnector() throws ComponentInitializationException {
IdPAttribute attr;
Set<IdPAttribute> attributeSet;
@@ -160,28 +160,28 @@ public final class TestSources {
* @throws ComponentInitializationException if we cannot initialized (unlikely)
*/
public static AttributeDefinition populatedStaticAttribute() throws ComponentInitializationException {
- return populatedStaticAttribute(STATIC_ATTRIBUTE_NAME, DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 2);
+ return populatedStaticAttribute(DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 2);
}
- public static AttributeDefinition populatedStaticAttribute(String definitionName, String attributeName,
- int attributeCount) throws ComponentInitializationException {
+ public static AttributeDefinition populatedStaticAttribute(String attributeName,
+ int attributeValuesCount) throws ComponentInitializationException {
IdPAttribute attr;
List<IdPAttributeValue<?>> valuesList = new ArrayList<>();
- if (attributeCount > 0) {
+ if (attributeValuesCount > 0) {
valuesList.add(new StringAttributeValue(COMMON_ATTRIBUTE_VALUE_STRING));
}
- if (attributeCount > 1) {
+ if (attributeValuesCount > 1) {
valuesList.add(new StringAttributeValue(ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
}
- for (int i = 2; i < attributeCount; i++) {
+ for (int i = 2; i < attributeValuesCount; i++) {
valuesList.add(new StringAttributeValue(ATTRIBUTE_ATTRIBUTE_VALUE_STRING + i));
}
attr = new IdPAttribute(attributeName);
attr.setValues(valuesList);
StaticAttributeDefinition definition = new StaticAttributeDefinition();
- definition.setId(definitionName);
+ definition.setId(attributeName);
definition.setValue(attr);
definition.initialize();
return definition;
@@ -192,8 +192,7 @@ public final class TestSources {
defn.setId(name);
// Set the dependency on the data connector
- ResolverPluginDependency depend = new ResolverPluginDependency(TestSources.STATIC_ATTRIBUTE_NAME);
- depend.setDependencyAttributeId(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ ResolverPluginDependency depend = new ResolverAttributeDefinitionDependency(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
defn.setDependencies(Collections.singleton(depend));
defn.initialize();
return defn;
@@ -212,12 +211,26 @@ public final class TestSources {
return retVal;
}
- public static ResolverPluginDependency makeResolverPluginDependency(String pluginId, String attributeId) {
- ResolverPluginDependency retVal = new ResolverPluginDependency(pluginId);
- retVal.setDependencyAttributeId(attributeId);
+ public static ResolverPluginDependency makeResolverPluginDependency(String attributeId) {
+ ResolverAttributeDefinitionDependency retVal = new ResolverAttributeDefinitionDependency(attributeId);
return retVal;
}
+
+ public static ResolverPluginDependency makeResolverPluginDependency(String connectorId, String attributeId) {
+ ResolverDataConnectorDependency retVal = new ResolverDataConnectorDependency(connectorId);
+ 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 {
/** Static value returned by this definition. */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list