[java-identity-provider] branch main updated: Remove use of Deprecated AttributeContext setters from tests
Codeberg
noreply at shibboleth.net
Sun Oct 18 15:00:56 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
https://codeberg.org/Shibboleth/java-identity-provider/commit/1dc9722e4fd42d738c5c9c272752e5b96831f60c
The following commit(s) were added to refs/heads/main by this push:
new 1dc9722e4 Remove use of Deprecated AttributeContext setters from tests
1dc9722e4 is described below
commit 1dc9722e4fd42d738c5c9c272752e5b96831f60c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Oct 18 16:01:07 2026 +0100
Remove use of Deprecated AttributeContext setters from tests
---
...ributeSourcedSAML1NameIdentifierGeneratorTest.java | 12 ++++++------
.../AttributeSourcedSAML2NameIDGeneratorTest.java | 12 ++++++------
.../impl/PersistentSAML2NameIDGeneratorTest.java | 8 ++++----
.../nameid/impl/StoredPersistentIdDecoderTest.java | 6 +++---
.../impl/AddAttributeStatementToAssertionTest.java | 8 +++++---
.../impl/FilterByQueriedAttributeDesignatorsTest.java | 17 +++++++++++------
.../impl/AddAttributeStatementToAssertionTest.java | 9 ++++++---
.../profile/impl/FilterByQueriedAttributesTest.java | 19 ++++++++++++-------
.../net/shibboleth/idp/ui/AttributeHelperTest.java | 5 +++--
9 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
index 64e092e83..cf14b81af 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
@@ -126,7 +126,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
inputAttribute.setValues(values);
prc.ensureSubcontext(RelyingPartyContext.class).ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -142,7 +142,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setFormat(NameIdentifier.EMAIL);
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
@@ -158,7 +158,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -178,7 +178,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -198,7 +198,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -223,7 +223,7 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
index 641df6e02..3a6fa57ce 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
@@ -127,7 +127,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -142,7 +142,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setFormat(NameID.EMAIL);
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
@@ -158,7 +158,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -178,7 +178,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -198,7 +198,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
@@ -220,7 +220,7 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.ensureSubcontext(AttributeContext.class).setIdPAttributes(
- CollectionSupport.singleton(inputAttribute));
+ CollectionSupport.singletonMap(inputAttribute.getId(),inputAttribute));
generator.setAttributeSourceIds(CollectionSupport.singletonList(ATTR_NAME));
generator.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java
index 779624b03..c83b28aea 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java
@@ -136,7 +136,7 @@ public class PersistentSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(new IdPAttribute("SOURCE")));
+ CollectionSupport.singletonMap("SOURCE", new IdPAttribute("SOURCE")));
Assert.assertNull(generator.generate(prc, NameID.PERSISTENT));
}
@@ -157,7 +157,7 @@ public class PersistentSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase
source.setValues(CollectionSupport.singletonList(new StringAttributeValue(TestSources.COMMON_ATTRIBUTE_VALUE_STRING)));
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
- rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(CollectionSupport.singleton(source));
+ rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(CollectionSupport.singletonMap(source.getId(), source));
final NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id!=null;
Assert.assertEquals(id.getValue(), RESULT);
@@ -213,7 +213,7 @@ public class PersistentSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(source));
+ CollectionSupport.singletonMap(source.getId(), source));
NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id!=null;
Assert.assertNotNull(id.getValue());
@@ -280,7 +280,7 @@ public class PersistentSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(source));
+ CollectionSupport.singletonMap(source.getId(), source));
NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id!=null;
Assert.assertEquals(id.getValue(), RESULT);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java
index 0e950974e..ce9c72341 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java
@@ -120,7 +120,7 @@ public class StoredPersistentIdDecoderTest extends OpenSAMLInitBaseTestCase {
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(source));
+ CollectionSupport.singletonMap(source.getId(), source));
final NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id!=null;
Assert.assertNotNull(id.getValue());
@@ -148,7 +148,7 @@ public class StoredPersistentIdDecoderTest extends OpenSAMLInitBaseTestCase {
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(source));
+ CollectionSupport.singletonMap(source.getId(), source));
final NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id != null;
Assert.assertNotNull(id.getValue());
@@ -177,7 +177,7 @@ public class StoredPersistentIdDecoderTest extends OpenSAMLInitBaseTestCase {
final RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class);
assert rpc!=null;
rpc.ensureSubcontext(AttributeContext.class).setUnfilteredIdPAttributes(
- CollectionSupport.singleton(source));
+ CollectionSupport.singletonMap(source.getId(), source));
final NameID id = generator.generate(prc, NameID.PERSISTENT);
assert id!=null;
Assert.assertNotNull(id.getValue());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
index 31f4042eb..dd68032e3 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -233,7 +233,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
attribute.setValues(CollectionSupport.singletonList(new StringAttributeValue(MY_VALUE_1)));
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.singletonList(attribute));
+ attribCtx.setIdPAttributes(CollectionSupport.singletonMap(attribute.getId(), attribute));
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.addSubcontext(attribCtx);
@@ -276,7 +276,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
attribute.setValues(CollectionSupport.singletonList(new StringAttributeValue(MY_VALUE_1)));
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.singletonList(attribute));
+ attribCtx.setIdPAttributes(CollectionSupport.singletonMap(attribute.getId(), attribute));
+
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.addSubcontext(attribCtx);
@@ -405,9 +406,10 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
final IdPAttribute attribute2 = new IdPAttribute(MY_NAME_2);
attribute2.setValues(CollectionSupport.singletonList(new StringAttributeValue(MY_VALUE_2)));
+ final Map<String, IdPAttribute> attrs = Map.of(MY_NAME_1, attribute1, MY_NAME_2, attribute2);
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.listOf(attribute1, attribute2));
+ attribCtx.setIdPAttributes(attrs);
return attribCtx;
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
index ac478dda9..10d63ca8f 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignatorsTest.java
@@ -19,6 +19,7 @@ import static org.testng.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nonnull;
@@ -120,11 +121,11 @@ public class FilterByQueriedAttributeDesignatorsTest extends XMLObjectBaseTestCa
@Test public void noValues() {
final RelyingPartyContext rpc = prc.ensureSubcontext(RelyingPartyContext.class);
final AttributeContext ac = rpc.ensureSubcontext(AttributeContext.class);
- final List<IdPAttribute> attributes = List.of(
- new IdPAttribute("eduPersonAssurance"),
- new IdPAttribute("flooby"),
- new IdPAttribute("eduPersonScopedAffiliation"),
- new IdPAttribute("eduPersonTargetedID"));
+ final Map<String, IdPAttribute> attributes = Map.of(
+ "eduPersonAssurance", new IdPAttribute("eduPersonAssurance"),
+ "flooby", new IdPAttribute("flooby"),
+ "eduPersonScopedAffiliation", new IdPAttribute("eduPersonScopedAffiliation"),
+ "eduPersonTargetedID", new IdPAttribute("eduPersonTargetedID"));
ac.setIdPAttributes(attributes);
final Event event = action.execute(rc);
ActionTestingSupport.assertProceedEvent(event);
@@ -142,7 +143,11 @@ public class FilterByQueriedAttributeDesignatorsTest extends XMLObjectBaseTestCa
eduPersonScopedAffiliation.setValues(List.of(new ScopedStringAttributeValue("blue", "yellow")));
final IdPAttribute eduPersonTargetedID = new IdPAttribute("eduPersonTargetedID");
eduPersonTargetedID.setValues(List.of(new StringAttributeValue("green-blue")));
- final List<IdPAttribute> attributes = List.of(eduPersonAssurance, flooby,eduPersonScopedAffiliation, eduPersonTargetedID);
+ final Map<String, IdPAttribute> attributes = Map.of(
+ "eduPersonAssurance", eduPersonAssurance,
+ "flooby", flooby,
+ "eduPersonScopedAffiliation", eduPersonScopedAffiliation,
+ "eduPersonTargetedID", eduPersonTargetedID);
ac.setIdPAttributes(attributes);
final Event event = action.execute(rc);
ActionTestingSupport.assertProceedEvent(event);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
index a340e113a..839f8c52e 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -240,7 +240,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
attribute.setValues(CollectionSupport.singletonList(new StringAttributeValue(MY_VALUE_1)));
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.singletonList(attribute));
+ attribCtx.setIdPAttributes(CollectionSupport.singletonMap(attribute.getId(), attribute));
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.addSubcontext(attribCtx);
@@ -283,7 +283,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
attribute.setValues(CollectionSupport.singletonList(new StringAttributeValue(MY_VALUE_1)));
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.singletonList(attribute));
+ attribCtx.setIdPAttributes(CollectionSupport.singletonMap(attribute.getId(), attribute));
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class);
assert rpCtx!=null;
rpCtx.addSubcontext(attribCtx);
@@ -413,7 +413,10 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
final IdPAttribute attribute3 = new IdPAttribute(MY_NAME_3);
final AttributeContext attribCtx = new AttributeContext();
- attribCtx.setIdPAttributes(CollectionSupport.listOf(attribute1, attribute2, attribute3));
+ attribCtx.setIdPAttributes(Map.of(
+ MY_NAME_1, attribute1,
+ MY_NAME_2, attribute2,
+ MY_NAME_3, attribute3));
return attribCtx;
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
index 339b1b779..3b8b03d65 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributesTest.java
@@ -19,6 +19,7 @@ import static org.testng.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nonnull;
@@ -118,12 +119,12 @@ public class FilterByQueriedAttributesTest extends XMLObjectBaseTestCase {
@Test public void noValues() {
final RelyingPartyContext rpc = prc.ensureSubcontext(RelyingPartyContext.class);
final AttributeContext ac = rpc.ensureSubcontext(AttributeContext.class);
- final List<IdPAttribute> attributes = List.of(
- new IdPAttribute("eduPersonAssurance"),
- new IdPAttribute("flooby"),
- new IdPAttribute("eduPersonScopedAffiliation"),
- new IdPAttribute("eduPersonTargetedID"));
- ac.setIdPAttributes(attributes);
+ final Map<String, IdPAttribute> attributes = Map.of(
+ "eduPersonAssurance", new IdPAttribute("eduPersonAssurance"),
+ "flooby", new IdPAttribute("flooby"),
+ "eduPersonScopedAffiliation", new IdPAttribute("eduPersonScopedAffiliation"),
+ "eduPersonTargetedID", new IdPAttribute("eduPersonTargetedID"));
+ ac.setIdPAttributes(attributes);
final Event event = action.execute(rc);
ActionTestingSupport.assertProceedEvent(event);
assertEquals(ac.getIdPAttributes().size(), 0);
@@ -139,7 +140,11 @@ public class FilterByQueriedAttributesTest extends XMLObjectBaseTestCase {
eduPersonScopedAffiliation.setValues(List.of(new ScopedStringAttributeValue("blue", "yellow")));
final IdPAttribute eduPersonTargetedID = new IdPAttribute("eduPersonTargetedID");
eduPersonTargetedID.setValues(List.of(new StringAttributeValue("green-blue")));
- final List<IdPAttribute> attributes = List.of(eduPersonAssurance, flooby,eduPersonScopedAffiliation, eduPersonTargetedID);
+ final Map<String, IdPAttribute> attributes = Map.of(
+ "eduPersonAssurance", eduPersonAssurance,
+ "flooby", flooby,
+ "eduPersonScopedAffiliation", eduPersonScopedAffiliation,
+ "eduPersonTargetedID", eduPersonTargetedID);
ac.setIdPAttributes(attributes);
final Event event = action.execute(rc);
ActionTestingSupport.assertProceedEvent(event);
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/AttributeHelperTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/AttributeHelperTest.java
index b03d1c311..5632d6cf8 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/AttributeHelperTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/AttributeHelperTest.java
@@ -6,6 +6,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeSupport;
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.attribute.resolver.testing.ResolverTestSupport;
import net.shibboleth.idp.ui.helper.AttributeHelper;
@@ -24,8 +25,8 @@ public class AttributeHelperTest {
ah.setId("AttributeHelper");
ah.initialize();
- ac.setUnfilteredIdPAttributes(CollectionSupport.arrayAsList(a1, a2));
- ac.setIdPAttributes(CollectionSupport.singleton(a1));
+ ac.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(CollectionSupport.arrayAsList(a1, a2)));
+ ac.setIdPAttributes(CollectionSupport.singletonMap(a1.getId(), a1));
assertEquals(ah.getFirstAttributeDisplayValue(prc, "A1"), "A1Value1");
assertEquals(ah.getFirstAttributeDisplayValue(prc, "A2"), "");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list