[java-shib-attribute] 01/03: Cleanup test file
Rod Widdowson
rdw at steadingsoftware.com
Fri Apr 18 14:02:32 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=ee85659be139d32e2132a2868680f1c7dd7543d0
commit ee85659be139d32e2132a2868680f1c7dd7543d0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 18 14:48:35 2025 +0100
Cleanup test file
---
.../shibboleth/idp/attribute/AttributeTest.java | 131 +++++++++++----------
1 file changed, 66 insertions(+), 65 deletions(-)
diff --git a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
index 5aacd9ba9..23f16dbde 100644
--- a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
+++ b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
@@ -16,6 +16,8 @@ package net.shibboleth.idp.attribute;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNotSame;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@@ -26,7 +28,6 @@ import java.util.List;
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.impl.EntityDescriptorBuilder;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
@@ -41,35 +42,35 @@ public class AttributeTest extends OpenSAMLInitBaseTestCase{
@Test public void instantiation() {
IdPAttribute attrib = new IdPAttribute("foo");
- Assert.assertEquals(attrib.getId(), "foo");
+ assertEquals(attrib.getId(), "foo");
- Assert.assertNotNull(attrib.getValues());
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertNotNull(attrib.getValues());
+ assertTrue(attrib.getValues().isEmpty());
- Assert.assertNotNull(attrib.hashCode());
+ assertNotNull(attrib.hashCode());
- Assert.assertTrue(attrib.equals(new IdPAttribute("foo")));
+ assertTrue(attrib.equals(new IdPAttribute("foo")));
}
/** Tests that empty IDs aren't accepted. */
@Test public void emptyId() {
try {
new IdPAttribute("");
- Assert.fail("able to create attribute with empty ID");
+ fail("able to create attribute with empty ID");
} catch (ConstraintViolationException e) {
// expected this
}
try {
new IdPAttribute(" ");
- Assert.fail("able to create attribute with empty ID");
+ fail("able to create attribute with empty ID");
} catch (ConstraintViolationException e) {
// expected this
}
try {
new IdPAttribute("a b");
- Assert.fail("able to create attribute ID with spaces");
+ fail("able to create attribute ID with spaces");
} catch (ConstraintViolationException e) {
// expected this
}
@@ -83,90 +84,90 @@ public class AttributeTest extends OpenSAMLInitBaseTestCase{
StringAttributeValue value2 = new StringAttributeValue("value2");
IdPAttribute attrib = new IdPAttribute("foo");
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertTrue(attrib.getValues().isEmpty());
attrib.setValues(null);
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertTrue(attrib.getValues().isEmpty());
attrib.setValues(CollectionSupport.emptyList());
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertTrue(attrib.getValues().isEmpty());
List<IdPAttributeValue> attribValues = new ArrayList<>();
attrib.setValues(attribValues);
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertTrue(attrib.getValues().isEmpty());
attribValues.add(null);
attrib.setValues(attribValues);
- Assert.assertTrue(attrib.getValues().isEmpty());
+ assertTrue(attrib.getValues().isEmpty());
- Assert.assertTrue(attrib.getValues().add(value1));
- Assert.assertEquals(attrib.getValues().size(), 1);
+ assertTrue(attrib.getValues().add(value1));
+ assertEquals(attrib.getValues().size(), 1);
// test adding another entry
- Assert.assertTrue(attrib.getValues().add(value2));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 2);
- Assert.assertTrue(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertTrue(attrib.getValues().add(value2));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 2);
+ assertTrue(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
// test adding null
try {
- Assert.assertFalse(attrib.getValues().add(null));
- Assert.fail();
+ assertFalse(attrib.getValues().add(null));
+ fail();
} catch (final NullPointerException e) {
// THis is OK by the annotation
}
// test adding an existing value
- Assert.assertFalse(attrib.getValues().add(value2));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 2);
- Assert.assertTrue(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertFalse(attrib.getValues().add(value2));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 2);
+ assertTrue(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
// test removing an entry
- Assert.assertTrue(attrib.getValues().remove(value1));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 1);
- Assert.assertFalse(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertTrue(attrib.getValues().remove(value1));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 1);
+ assertFalse(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
// test removing the same entry
- Assert.assertFalse(attrib.getValues().remove(value1));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 1);
- Assert.assertFalse(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertFalse(attrib.getValues().remove(value1));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 1);
+ assertFalse(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
// test removing null
- Assert.assertFalse(attrib.getValues().remove(null));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 1);
- Assert.assertFalse(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertFalse(attrib.getValues().remove(null));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 1);
+ assertFalse(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
// test removing the second entry
- Assert.assertTrue(attrib.getValues().remove(value2));
- Assert.assertTrue(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 0);
- Assert.assertFalse(attrib.getValues().contains(value1));
- Assert.assertFalse(attrib.getValues().contains(value2));
+ assertTrue(attrib.getValues().remove(value2));
+ assertTrue(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 0);
+ assertFalse(attrib.getValues().contains(value1));
+ assertFalse(attrib.getValues().contains(value2));
// test adding something once the collection has been drained
- Assert.assertTrue(attrib.getValues().add(value1));
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 1);
- Assert.assertTrue(attrib.getValues().contains(value1));
- Assert.assertFalse(attrib.getValues().contains(value2));
+ assertTrue(attrib.getValues().add(value1));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 1);
+ assertTrue(attrib.getValues().contains(value1));
+ assertFalse(attrib.getValues().contains(value2));
// test replacing all entries
List<IdPAttributeValue> values = new ArrayList<>();
values.add(value2);
attrib.setValues(values);
- Assert.assertFalse(attrib.getValues().isEmpty());
- Assert.assertEquals(attrib.getValues().size(), 1);
- Assert.assertFalse(attrib.getValues().contains(value1));
- Assert.assertTrue(attrib.getValues().contains(value2));
+ assertFalse(attrib.getValues().isEmpty());
+ assertEquals(attrib.getValues().size(), 1);
+ assertFalse(attrib.getValues().contains(value1));
+ assertTrue(attrib.getValues().contains(value2));
}
@SuppressWarnings("unlikely-arg-type")
@@ -175,16 +176,16 @@ public class AttributeTest extends OpenSAMLInitBaseTestCase{
IdPAttribute dupl = new IdPAttribute("foo");
IdPAttribute diff = new IdPAttribute("bar");
- Assert.assertTrue(attrib.equals(attrib));
- Assert.assertTrue(attrib.equals(dupl));
- Assert.assertFalse(attrib.equals(null));
- Assert.assertFalse(attrib.equals(Integer.valueOf(2)));
+ assertTrue(attrib.equals(attrib));
+ assertTrue(attrib.equals(dupl));
+ assertFalse(attrib.equals(null));
+ assertFalse(attrib.equals(Integer.valueOf(2)));
- Assert.assertEquals(attrib.hashCode(), dupl.hashCode());
- Assert.assertNotSame(attrib.hashCode(), diff.hashCode());
+ assertEquals(attrib.hashCode(), dupl.hashCode());
+ assertNotSame(attrib.hashCode(), diff.hashCode());
- Assert.assertTrue(attrib.compareTo(diff) > 0);
- Assert.assertEquals(attrib.compareTo(dupl) , 0);
+ assertTrue(attrib.compareTo(diff) > 0);
+ assertEquals(attrib.compareTo(dupl) , 0);
attrib.setValues(CollectionSupport.singletonList(new StringAttributeValue("value1")));
attrib.toString();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list