[java-shib-attribute] 01/02: Cleanup test file
Rod Widdowson
rdw at steadingsoftware.com
Fri Apr 18 13:48:26 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=9af494c2296c9820dc0b3b90113f383e9d4829b9
commit 9af494c2296c9820dc0b3b90113f383e9d4829b9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 18 14:34:08 2025 +0100
Cleanup test file
---
.../filter/context/AttributeFilterContextTest.java | 89 ++++++++++++----------
1 file changed, 48 insertions(+), 41 deletions(-)
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 0b1971be3..0c2010ca0 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
@@ -14,17 +14,24 @@
package net.shibboleth.idp.attribute.filter.context;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+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.List;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.shared.collection.CollectionSupport;
-
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.shared.collection.CollectionSupport;
+
/** Unit test for {@link AttributeFilterContext}. */
@SuppressWarnings("javadoc")
public class AttributeFilterContextTest {
@@ -35,15 +42,15 @@ public class AttributeFilterContextTest {
final AttributeFilterWorkContext child = context.ensureSubcontext(AttributeFilterWorkContext.class);
assert child != null;
- Assert.assertNotNull(context.getFilteredIdPAttributes());
- Assert.assertTrue(context.getFilteredIdPAttributes().isEmpty());
- Assert.assertNull(context.getParent());
- Assert.assertNotNull(context.getPrefilteredIdPAttributes());
- Assert.assertTrue(context.getPrefilteredIdPAttributes().isEmpty());
- Assert.assertNotNull(child.getPermittedIdPAttributeValues());
- Assert.assertTrue(child.getPermittedIdPAttributeValues().isEmpty());
- Assert.assertNotNull(child.getDeniedAttributeValues());
- Assert.assertTrue(child.getDeniedAttributeValues().isEmpty());
+ assertNotNull(context.getFilteredIdPAttributes());
+ assertTrue(context.getFilteredIdPAttributes().isEmpty());
+ assertNull(context.getParent());
+ assertNotNull(context.getPrefilteredIdPAttributes());
+ assertTrue(context.getPrefilteredIdPAttributes().isEmpty());
+ assertNotNull(child.getPermittedIdPAttributeValues());
+ assertTrue(child.getPermittedIdPAttributeValues().isEmpty());
+ assertNotNull(child.getDeniedAttributeValues());
+ assertTrue(child.getDeniedAttributeValues().isEmpty());
}
/** Test methods related to prefiltered attributes. */
@@ -52,24 +59,24 @@ public class AttributeFilterContextTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
context.setPrefilteredIdPAttributes(CollectionSupport.singletonList(attribute1));
- Assert.assertEquals(context.getPrefilteredIdPAttributes().size(), 1);
- Assert.assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
- Assert.assertEquals(context.getPrefilteredIdPAttributes().get("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);
context.setPrefilteredIdPAttributes(attributes);
- Assert.assertEquals(context.getPrefilteredIdPAttributes().size(), 2);
- Assert.assertFalse(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
- Assert.assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute2"));
- Assert.assertEquals(context.getPrefilteredIdPAttributes().get("attribute2"), attribute2);
- Assert.assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute3"));
- Assert.assertEquals(context.getPrefilteredIdPAttributes().get("attribute3"), attribute3);
+ assertEquals(context.getPrefilteredIdPAttributes().size(), 2);
+ assertFalse(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
+ assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute2"));
+ assertEquals(context.getPrefilteredIdPAttributes().get("attribute2"), attribute2);
+ assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute3"));
+ assertEquals(context.getPrefilteredIdPAttributes().get("attribute3"), attribute3);
context.setPrefilteredIdPAttributes(null);
- Assert.assertNotNull(context.getPrefilteredIdPAttributes());
- Assert.assertTrue(context.getPrefilteredIdPAttributes().isEmpty());
+ assertNotNull(context.getPrefilteredIdPAttributes());
+ assertTrue(context.getPrefilteredIdPAttributes().isEmpty());
}
/** Test methods related to filtered attributes. */
@@ -78,40 +85,40 @@ public class AttributeFilterContextTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
context.setFilteredIdPAttributes(CollectionSupport.singletonList(attribute1));
- Assert.assertEquals(context.getFilteredIdPAttributes().size(), 1);
- Assert.assertTrue(context.getFilteredIdPAttributes().containsKey("attribute1"));
- Assert.assertEquals(context.getFilteredIdPAttributes().get("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);
context.setFilteredIdPAttributes(attributes);
- Assert.assertEquals(context.getFilteredIdPAttributes().size(), 2);
- Assert.assertFalse(context.getFilteredIdPAttributes().containsKey("attribute1"));
- Assert.assertTrue(context.getFilteredIdPAttributes().containsKey("attribute2"));
- Assert.assertEquals(context.getFilteredIdPAttributes().get("attribute2"), attribute2);
- Assert.assertTrue(context.getFilteredIdPAttributes().containsKey("attribute3"));
- Assert.assertEquals(context.getFilteredIdPAttributes().get("attribute3"), attribute3);
+ assertEquals(context.getFilteredIdPAttributes().size(), 2);
+ assertFalse(context.getFilteredIdPAttributes().containsKey("attribute1"));
+ assertTrue(context.getFilteredIdPAttributes().containsKey("attribute2"));
+ assertEquals(context.getFilteredIdPAttributes().get("attribute2"), attribute2);
+ assertTrue(context.getFilteredIdPAttributes().containsKey("attribute3"));
+ assertEquals(context.getFilteredIdPAttributes().get("attribute3"), attribute3);
context.setFilteredIdPAttributes(null);
- Assert.assertNotNull(context.getFilteredIdPAttributes());
- Assert.assertTrue(context.getFilteredIdPAttributes().isEmpty());
+ assertNotNull(context.getFilteredIdPAttributes());
+ assertTrue(context.getFilteredIdPAttributes().isEmpty());
}
@Test public void fields() {
final AttributeFilterContext context = new AttributeFilterContext();
- Assert.assertNull(context.getAttributeIssuerID());
- Assert.assertNull(context.getAttributeRecipientID());
- Assert.assertNull(context.getPrincipal());
+ assertNull(context.getAttributeIssuerID());
+ assertNull(context.getAttributeRecipientID());
+ assertNull(context.getPrincipal());
context.setAttributeIssuerID("aiid");
- Assert.assertEquals(context.getAttributeIssuerID(), "aiid");
+ assertEquals(context.getAttributeIssuerID(), "aiid");
context.setAttributeRecipientID("arid");
- Assert.assertEquals(context.getAttributeRecipientID(), "arid");
+ assertEquals(context.getAttributeRecipientID(), "arid");
context.setPrincipal("princ");
- Assert.assertEquals(context.getPrincipal(), "princ");
+ assertEquals(context.getPrincipal(), "princ");
}
@Test public void strategies() {
@@ -122,6 +129,6 @@ public class AttributeFilterContextTest {
context.setRequesterMetadataContextLookupStrategy(new ChildContextLookup<AttributeFilterContext, SAMLMetadataContext>(
SAMLMetadataContext.class));
- Assert.assertSame(context.getRequesterMetadataContext(), mas);
+ assertSame(context.getRequesterMetadataContext(), mas);
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list