[java-shib-attribute] 01/02: Fix Tests after removal of deprecated functions.

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/43a5d6a9be21f48f74019100152f7d11ed440752

commit 43a5d6a9be21f48f74019100152f7d11ed440752
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 19 19:41:03 2026 +0100

    Fix Tests after removal of deprecated functions.
---
 .../net/shibboleth/idp/attribute/AttributeContextTest.java  |  4 ++--
 .../filter/context/AttributeFilterContextTest.java          | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
index 6adab92d6..5b5817a2b 100644
--- a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
+++ b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
@@ -101,7 +101,7 @@ public class AttributeContextTest {
     @Test public void testAttributeNoMerge() {
 
         final AttributeContext context = new AttributeContext();
-        context.setIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(getMergeList()));
+        context.setIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(getMergeList()));
 
         Map<String, IdPAttribute> attrs = context.getIdPAttributes();
 
@@ -126,7 +126,7 @@ public class AttributeContextTest {
 
     @Test public void testUnfilteredNoMerge() {
         final AttributeContext context = new AttributeContext();
-        context.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(getMergeList()));
+        context.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(getMergeList()));
 
         Map<String, IdPAttribute> attrs = context.getUnfilteredIdPAttributes();
         assertEquals(attrs.size(), 3);
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
index fb59dc1cc..d847d8ca8 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
@@ -21,7 +21,6 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -63,14 +62,14 @@ public class AttributeFilterContextTest {
         final AttributeFilterContext context = new AttributeFilterContext();
 
         final IdPAttribute attribute1 = new IdPAttribute("attribute1");
-        context.setPrefilteredIdPAttributes(CollectionSupport.singletonList(attribute1));
+        context.setPrefilteredIdPAttributes(CollectionSupport.singletonMap("attribute1", attribute1));
         assertEquals(context.getPrefilteredIdPAttributes().size(), 1);
         assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
         assertEquals(context.getPrefilteredIdPAttributes().get("attribute1"), attribute1);
 
         final IdPAttribute attribute2 = new IdPAttribute("attribute2");
         final IdPAttribute attribute3 = new IdPAttribute("attribute3");
-        final List<IdPAttribute> attributes = Arrays.asList(attribute2, attribute3);
+        final Map<String, IdPAttribute> attributes = Map.of("attribute2", attribute2, "attribute3", attribute3);
         context.setPrefilteredIdPAttributes(attributes);
         assertEquals(context.getPrefilteredIdPAttributes().size(), 2);
         assertFalse(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
@@ -79,7 +78,7 @@ public class AttributeFilterContextTest {
         assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute3"));
         assertEquals(context.getPrefilteredIdPAttributes().get("attribute3"), attribute3);
 
-        context.setPrefilteredIdPAttributes((List<IdPAttribute>)null);
+        context.setPrefilteredIdPAttributes((Map<String,IdPAttribute>)null);
         assertNotNull(context.getPrefilteredIdPAttributes());
         assertTrue(context.getPrefilteredIdPAttributes().isEmpty());
     }
@@ -89,14 +88,14 @@ public class AttributeFilterContextTest {
         final AttributeFilterContext context = new AttributeFilterContext();
 
         final IdPAttribute attribute1 = new IdPAttribute("attribute1");
-        context.setFilteredIdPAttributes(CollectionSupport.singletonList(attribute1));
+        context.setFilteredIdPAttributes(CollectionSupport.singletonMap("attribute1", attribute1));
         assertEquals(context.getFilteredIdPAttributes().size(), 1);
         assertTrue(context.getFilteredIdPAttributes().containsKey("attribute1"));
         assertEquals(context.getFilteredIdPAttributes().get("attribute1"), attribute1);
 
         final IdPAttribute attribute2 = new IdPAttribute("attribute2");
         final IdPAttribute attribute3 = new IdPAttribute("attribute3");
-        final List<IdPAttribute> attributes = Arrays.asList(attribute2, attribute3);
+        final Map<String, IdPAttribute> attributes = Map.of("attribute2", attribute2, "attribute3", attribute3 );
         context.setFilteredIdPAttributes(attributes);
         assertEquals(context.getFilteredIdPAttributes().size(), 2);
         assertFalse(context.getFilteredIdPAttributes().containsKey("attribute1"));
@@ -113,7 +112,7 @@ public class AttributeFilterContextTest {
         assertTrue(context.getFilteredIdPAttributes().containsKey("attribute3"));
         assertEquals(context.getFilteredIdPAttributes().get("attribute3"), attribute3);
 
-        context.setFilteredIdPAttributes((List<IdPAttribute>)null);
+        context.setFilteredIdPAttributes((Map<String, IdPAttribute>)null);
         assertNotNull(context.getFilteredIdPAttributes());
         assertTrue(context.getFilteredIdPAttributes().isEmpty());
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.