[java-identity-provider] 03/10: idp-attribute-resolver-impl: Use static imports for all the asserts in the tests
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 11 08:59:55 EDT 2019
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=ac3fcba9caf7ab046ccc89585d93dc9df202ba14
commit ac3fcba9caf7ab046ccc89585d93dc9df202ba14
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 10 16:02:23 2019 +0100
idp-attribute-resolver-impl: Use static imports for all the asserts in the tests
---
.../ContextDerivedAttributeDefinitionTest.java | 17 +-
.../idp/attribute/resolver/ad/impl/LogicTest.java | 36 ++--
.../resolver/ad/impl/PrescopedAtributeTest.java | 46 ++---
.../impl/PrincipalNameAttributeDefinitionTest.java | 14 +-
.../resolver/ad/impl/RegexAtributeTest.java | 42 +++--
...SAML1NameIdentifierAttributeDefinitionTest.java | 52 +++---
.../impl/SAML2NameIDAttributeDefinitionTest.java | 64 +++----
.../resolver/ad/impl/ScopedAttributeTest.java | 44 ++---
.../resolver/ad/impl/ScriptedAttributeTest.java | 165 ++++++++---------
.../resolver/ad/impl/SimpleAttributeTest.java | 43 ++---
.../ad/impl/StaticAttributeDefinitionTest.java | 37 ++--
.../resolver/ad/impl/TemplateAttributeTest.java | 57 +++---
.../ad/mapped/impl/MappedAttributeTest.java | 89 +++++-----
.../resolver/ad/mapped/impl/SourceValueTest.java | 19 +-
.../resolver/ad/mapped/impl/ValueMapTest.java | 28 +--
.../dc/http/impl/HTTPDataConnectorTest.java | 48 ++---
.../dc/impl/ComputedIDDataConnectorTest.java | 36 ++--
.../dc/impl/SAMLAttributeDataConnectorTest.java | 26 +--
.../dc/impl/ScriptedDataConnectorTest.java | 42 ++---
.../resolver/dc/impl/StaticDataConnectorTest.java | 36 ++--
.../dc/impl/StoredIDDataConnectorTest.java | 41 +++--
.../dc/ldap/impl/LDAPDataConnectorTest.java | 197 +++++++++++----------
.../resolver/dc/ldap/impl/Regressions.java | 30 ++--
.../dc/rdbms/impl/RDBMSDataConnectorTest.java | 105 +++++------
.../impl/AttributeResolutionContextTest.java | 83 +++++----
.../resolver/impl/AttributeResolverImplTest.java | 123 +++++++------
26 files changed, 805 insertions(+), 715 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java
index 2c95501..f91d2e3 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java
@@ -17,6 +17,10 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -24,6 +28,8 @@ import java.util.Map;
import javax.security.auth.Subject;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -36,9 +42,6 @@ import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** Test for {@link SubjectDerivedAttributeValuesFunction}. */
public class ContextDerivedAttributeDefinitionTest {
@@ -79,9 +82,9 @@ public class ContextDerivedAttributeDefinitionTest {
final List<IdPAttributeValue<?>> foo = defn.resolve(ctx).getValues();
- Assert.assertEquals(2, foo.size());
- Assert.assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE)));
- Assert.assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE + "2")));
+ assertEquals(2, foo.size());
+ assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE)));
+ assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE + "2")));
}
@Test public void empty() throws ComponentInitializationException, ResolutionException {
@@ -113,7 +116,7 @@ public class ContextDerivedAttributeDefinitionTest {
authnResults.put("one", new AuthenticationResult("1", subject));
final IdPAttribute result = defn.resolve(ctx);
- Assert.assertNull(result);
+ assertNull(result);
}
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
index 9fbcb8f..c01fabf 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
@@ -17,18 +17,20 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import java.util.Collections;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.logic.AttributeIssuerIdPredicate;
import net.shibboleth.idp.attribute.resolver.logic.AttributePrincipalPredicate;
import net.shibboleth.idp.attribute.resolver.logic.AttributeRecipientIdPredicate;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
/**
* Test for {@link AttributeIssuerIdPredicate}, {@link AttributePrincipalPredicate} and {@link AttributeRecipientIdPredicate}.
*/
@@ -42,14 +44,14 @@ public class LogicTest {
@Test public void empty() {
final ProfileRequestContext pfc = new ProfileRequestContext<>();
- Assert.assertFalse(aiip.test(pfc));
- Assert.assertFalse(app.test(pfc));
- Assert.assertFalse(arip.test(pfc));
+ assertFalse(aiip.test(pfc));
+ assertFalse(app.test(pfc));
+ assertFalse(arip.test(pfc));
pfc.getSubcontext(AttributeResolutionContext.class, true);
- Assert.assertFalse(aiip.test(pfc));
- Assert.assertFalse(app.test(pfc));
- Assert.assertFalse(arip.test(pfc));
+ assertFalse(aiip.test(pfc));
+ assertFalse(app.test(pfc));
+ assertFalse(arip.test(pfc));
}
@Test public void wrong() {
@@ -60,9 +62,9 @@ public class LogicTest {
arc.setPrincipal("badValue");
arc.setAttributeRecipientID("badValue");
- Assert.assertFalse(aiip.test(pfc));
- Assert.assertFalse(app.test(pfc));
- Assert.assertFalse(arip.test(pfc));
+ assertFalse(aiip.test(pfc));
+ assertFalse(app.test(pfc));
+ assertFalse(arip.test(pfc));
}
@Test public void correct() {
@@ -73,8 +75,8 @@ public class LogicTest {
arc.setPrincipal("Principal");
arc.setAttributeRecipientID("ARI");
- Assert.assertTrue(aiip.test(pfc));
- Assert.assertTrue(app.test(pfc));
- Assert.assertTrue(arip.test(pfc));
+ assertTrue(aiip.test(pfc));
+ assertTrue(app.test(pfc));
+ assertTrue(arip.test(pfc));
}
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
index 3f5c962..abe5bbe 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
@@ -17,13 +17,17 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -89,9 +93,9 @@ public class PrescopedAtributeTest {
resolver.resolveAttributes(context);
final Collection f = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(f.size(), 2);
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("at1", "Data")));
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("at1", "Connector")));
+ assertEquals(f.size(), 2);
+ assertTrue(f.contains(new ScopedStringAttributeValue("at1", "Data")));
+ assertTrue(f.contains(new ScopedStringAttributeValue("at1", "Connector")));
}
/**
@@ -126,7 +130,7 @@ public class PrescopedAtributeTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail();
+ fail();
} catch (final ResolutionException e) {
// OK
}
@@ -149,7 +153,7 @@ public class PrescopedAtributeTest {
try {
attrDef.resolve(resolutionContext);
- Assert.fail("Invalid type");
+ fail("Invalid type");
} catch (final ResolutionException e) {
//
}
@@ -180,9 +184,9 @@ public class PrescopedAtributeTest {
final Collection f = result.getValues();
- Assert.assertEquals(f.size(), 2);
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("one", "two")));
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("three", "four")));
+ assertEquals(f.size(), 2);
+ assertTrue(f.contains(new ScopedStringAttributeValue("one", "two")));
+ assertTrue(f.contains(new ScopedStringAttributeValue("three", "four")));
}
@@ -216,8 +220,8 @@ public class PrescopedAtributeTest {
final Collection f = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
// 2 empty attribute values are produced, but they get de-duped into a single value
- Assert.assertEquals(f.size(), 1);
- Assert.assertEquals(f.iterator().next(), EmptyAttributeValue.ZERO_LENGTH);
+ assertEquals(f.size(), 1);
+ assertEquals(f.iterator().next(), EmptyAttributeValue.ZERO_LENGTH);
}
@Test public void initDestroyParms() throws ResolutionException, ComponentInitializationException {
@@ -231,18 +235,18 @@ public class PrescopedAtributeTest {
try {
attrDef.setScopeDelimiter(null);
- Assert.fail("set null delimiter");
+ fail("set null delimiter");
} catch (final ConstraintViolationException e) {
// OK
}
attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
- Assert.assertNotNull(attrDef.getScopeDelimiter());
+ assertNotNull(attrDef.getScopeDelimiter());
attrDef.setScopeDelimiter(DELIMITER);
try {
attrDef.initialize();
- Assert.fail("no Dependency - should fail");
+ fail("no Dependency - should fail");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -250,17 +254,17 @@ public class PrescopedAtributeTest {
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("resolve not initialized");
+ fail("resolve not initialized");
} catch (final UninitializedComponentException e) {
// OK
}
attrDef.initialize();
- Assert.assertEquals(attrDef.getScopeDelimiter(), DELIMITER);
+ assertEquals(attrDef.getScopeDelimiter(), DELIMITER);
try {
attrDef.resolve(null);
- Assert.fail("Null context not allowed");
+ fail("Null context not allowed");
} catch (final ConstraintViolationException e) {
// OK
}
@@ -268,21 +272,21 @@ public class PrescopedAtributeTest {
attrDef.destroy();
try {
attrDef.initialize();
- Assert.fail("Init after destroy");
+ fail("Init after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("Resolve after destroy");
+ fail("Resolve after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
try {
attrDef.setScopeDelimiter(DELIMITER);
- Assert.fail("Set Delimiter after destroy");
+ fail("Set Delimiter after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
index bac8232..8459242 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
@@ -17,18 +17,18 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalNameAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link PrincipalNameAttributeDefinition}
*/
@@ -74,11 +74,11 @@ public class PrincipalNameAttributeDefinitionTest {
IdPAttribute result = defn.resolve(TestSources.createResolutionContext("principal", "issuer", "recipient"));
- Assert.assertEquals(result.getValues().size(), 1);
+ assertEquals(result.getValues().size(), 1);
StringAttributeValue value = (StringAttributeValue) result.getValues().iterator().next();
- Assert.assertEquals(value.getValue(), "principal");
+ assertEquals(value.getValue(), "principal");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
index da6c38f..e659da9 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -24,7 +29,6 @@ import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -90,8 +94,8 @@ public class RegexAtributeTest {
resolver.resolveAttributes(context);
final Collection f = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(f.size(), 1);
- Assert.assertTrue(f.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_RESULT), "looking for regexp result");
+ assertEquals(f.size(), 1);
+ assertTrue(f.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_RESULT), "looking for regexp result");
}
@Test public void nullValueType() throws ComponentInitializationException, ResolutionException {
@@ -119,8 +123,8 @@ public class RegexAtributeTest {
final Collection f = result.getValues();
- Assert.assertEquals(f.size(), 1);
- Assert.assertTrue(f.contains(new StringAttributeValue("Connect")));
+ assertEquals(f.size(), 1);
+ assertTrue(f.contains(new StringAttributeValue("Connect")));
}
@@ -140,7 +144,7 @@ public class RegexAtributeTest {
try {
attrDef.resolve(resolutionContext);
- Assert.fail("Invalid type");
+ fail("Invalid type");
} catch (final ResolutionException e) {
//
}
@@ -173,8 +177,8 @@ public class RegexAtributeTest {
resolver.resolveAttributes(context);
final Collection f = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(f.size(), 1);
- Assert.assertEquals(f.iterator().next(), EmptyAttributeValue.ZERO_LENGTH);
+ assertEquals(f.size(), 1);
+ assertEquals(f.iterator().next(), EmptyAttributeValue.ZERO_LENGTH);
}
@Test public void initDestroyParms() throws ResolutionException, ComponentInitializationException {
@@ -187,24 +191,24 @@ public class RegexAtributeTest {
attrDef.setId(TEST_ATTRIBUTE_NAME);
try {
attrDef.initialize();
- Assert.fail("no regexp - should fail");
+ fail("no regexp - should fail");
} catch (final ComponentInitializationException e) {
// OK
}
try {
attrDef.setRegularExpression(null);
- Assert.fail("set null regexp");
+ fail("set null regexp");
} catch (final ConstraintViolationException e) {
// OK
}
attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
- Assert.assertNull(attrDef.getRegularExpression());
+ assertNull(attrDef.getRegularExpression());
attrDef.setRegularExpression(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
try {
attrDef.initialize();
- Assert.fail("no Dependency - should fail");
+ fail("no Dependency - should fail");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -212,17 +216,17 @@ public class RegexAtributeTest {
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("resolve not initialized");
+ fail("resolve not initialized");
} catch (final UninitializedComponentException e) {
// OK
}
attrDef.initialize();
- Assert.assertEquals(attrDef.getRegularExpression(), TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
+ assertEquals(attrDef.getRegularExpression(), TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
try {
attrDef.resolve(null);
- Assert.fail("Null context not allowed");
+ fail("Null context not allowed");
} catch (final ConstraintViolationException e) {
// OK
}
@@ -230,21 +234,21 @@ public class RegexAtributeTest {
attrDef.destroy();
try {
attrDef.initialize();
- Assert.fail("Init after destroy");
+ fail("Init after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
try {
attrDef.setRegularExpression(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
- Assert.fail("setRegExp after destroy");
+ fail("setRegExp after destroy");
} catch (final UnmodifiableComponentException e) {
// OK
}
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("Resolve after destroy");
+ fail("Resolve after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
}
-}
\ No newline at end of file
+}
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 53f4dae..7092edc 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
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -26,7 +31,6 @@ import java.util.Set;
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.saml1.core.NameIdentifier;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -73,7 +77,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final IdPAttribute result =
defn.resolve(TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null));
- Assert.assertTrue(result.getValues().isEmpty());
+ assertTrue(result.getValues().isEmpty());
}
@Test public void simple() throws ResolutionException, ComponentInitializationException {
@@ -97,20 +101,20 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 2);
+ assertEquals(values.size(), 2);
final Collection<String> nameValues = new HashSet<>(2);
for (final IdPAttributeValue val : values) {
final NameIdentifier id = (NameIdentifier) val.getValue();
- Assert.assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
+ assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
nameValues.add(id.getValue());
}
- Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
- Assert.assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
}
@Test public void nullValueType() throws ComponentInitializationException, ResolutionException {
@@ -141,20 +145,20 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> outValues = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(outValues.size(), 2);
+ assertEquals(outValues.size(), 2);
final Collection<String> nameValues = new HashSet<>(2);
for (final IdPAttributeValue val : outValues) {
final NameIdentifier id = (NameIdentifier) val.getValue();
- Assert.assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
+ assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
nameValues.add(id.getValue());
}
- Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
- Assert.assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
}
@Test public void nullIssuerID() throws ComponentInitializationException {
@@ -176,7 +180,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail("resolution Should have failed");
+ fail("resolution Should have failed");
} catch (final ResolutionException e) {
// OK
}
@@ -210,7 +214,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final AttributeResolutionContext context =
TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, TestSources.SP_ENTITY_ID);
resolver.resolveAttributes(context);
- Assert.assertNull(context.getResolvedIdPAttributes().get(SECOND_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(SECOND_ATTRIBUTE_NAME));
}
@Test public void singleValueWithOptions() throws ResolutionException, ComponentInitializationException {
@@ -238,17 +242,17 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 1);
+ assertEquals(values.size(), 1);
final NameIdentifier id = (NameIdentifier) values.iterator().next().getValue();
- Assert.assertEquals(id.getFormat(), ALTERNATIVE_FORMAT);
- Assert.assertEquals(defn.getNameIdFormat(), id.getFormat());
- Assert.assertEquals(id.getNameQualifier(), ALTERNATE_QUALIFIER);
- Assert.assertEquals(defn.getNameIdQualifier(), id.getNameQualifier());
- Assert.assertEquals(id.getValue(), TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
+ assertEquals(id.getFormat(), ALTERNATIVE_FORMAT);
+ assertEquals(defn.getNameIdFormat(), id.getFormat());
+ assertEquals(id.getNameQualifier(), ALTERNATE_QUALIFIER);
+ assertEquals(defn.getNameIdQualifier(), id.getNameQualifier());
+ assertEquals(id.getValue(), TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
}
-}
\ No newline at end of file
+}
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 5c78594..04dd7ca 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
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -26,7 +31,6 @@ import java.util.Set;
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.saml.saml2.core.NameID;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -86,7 +90,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final IdPAttribute result = defn.resolve(context);
- Assert.assertTrue(result.getValues().isEmpty());
+ assertTrue(result.getValues().isEmpty());
}
private AttributeResolver setupResolver() throws ComponentInitializationException {
@@ -118,18 +122,18 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
resolver.resolveAttributes(context);
final Collection<IdPAttributeValue<?>> values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 2);
+ assertEquals(values.size(), 2);
final Collection<String> nameValues = new HashSet<>(2);
for (final IdPAttributeValue val : values) {
final NameID id = (NameID) val.getValue();
- Assert.assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertNull(id.getSPProvidedID());
- Assert.assertEquals(id.getSPNameQualifier(), TestSources.SP_ENTITY_ID);
- Assert.assertEquals(id.getNameQualifier(), TestSources.IDP_ENTITY_ID);
+ assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertNull(id.getSPProvidedID());
+ assertEquals(id.getSPNameQualifier(), TestSources.SP_ENTITY_ID);
+ assertEquals(id.getNameQualifier(), TestSources.IDP_ENTITY_ID);
nameValues.add(id.getValue());
}
- Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
- Assert.assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
}
@Test public void nullValueType() throws ComponentInitializationException, ResolutionException {
@@ -161,20 +165,20 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> outValues = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(outValues.size(), 2);
+ assertEquals(outValues.size(), 2);
final Collection<String> nameValues = new HashSet<>(2);
for (final IdPAttributeValue val : outValues) {
final NameID id = (NameID) val.getValue();
- Assert.assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertEquals(id.getNameQualifier(), TestSources.IDP_ENTITY_ID);
+ assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertEquals(id.getNameQualifier(), TestSources.IDP_ENTITY_ID);
nameValues.add(id.getValue());
}
- Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
- Assert.assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));
+ assertTrue(nameValues.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING));
}
@@ -185,7 +189,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
AttributeResolutionContext context = TestSources.createResolutionContext(null, null, TestSources.SP_ENTITY_ID);
try {
resolver.resolveAttributes(context);
- Assert.fail("null IdP EntityId should throw");
+ fail("null IdP EntityId should throw");
} catch (final ResolutionException e) {
// OK
}
@@ -195,7 +199,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null);
try {
resolver.resolveAttributes(context);
- Assert.fail("null IdP EntityId should throw");
+ fail("null IdP EntityId should throw");
} catch (final ResolutionException e) {
// OK
}
@@ -228,9 +232,9 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed");
+ fail("resolution failed");
}
- Assert.assertNull(context.getResolvedIdPAttributes().get(SECOND_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(SECOND_ATTRIBUTE_NAME));
}
@Test public void singleValueWithOptions() throws ResolutionException,
@@ -260,20 +264,20 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 1);
+ assertEquals(values.size(), 1);
final NameID id = (NameID) values.iterator().next().getValue();
- Assert.assertEquals(id.getFormat(), ALTERNATIVE_FORMAT);
- Assert.assertEquals(defn.getNameIdFormat(), id.getFormat());
- Assert.assertNull(id.getSPProvidedID());
- Assert.assertEquals(id.getSPNameQualifier(), ALTERNATE_SP_QUALIFIER);
- Assert.assertEquals(defn.getNameIdSPQualifier(), id.getSPNameQualifier());
- Assert.assertEquals(id.getNameQualifier(), ALTERNATE_QUALIFIER);
- Assert.assertEquals(defn.getNameIdQualifier(), id.getNameQualifier());
- Assert.assertEquals(id.getValue(), TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
+ assertEquals(id.getFormat(), ALTERNATIVE_FORMAT);
+ assertEquals(defn.getNameIdFormat(), id.getFormat());
+ assertNull(id.getSPProvidedID());
+ assertEquals(id.getSPNameQualifier(), ALTERNATE_SP_QUALIFIER);
+ assertEquals(defn.getNameIdSPQualifier(), id.getSPNameQualifier());
+ assertEquals(id.getNameQualifier(), ALTERNATE_QUALIFIER);
+ assertEquals(defn.getNameIdQualifier(), id.getNameQualifier());
+ assertEquals(id.getValue(), TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
index a2c1ecf..b790ead 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,7 +30,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -96,11 +100,11 @@ public class ScopedAttributeTest {
// Now test that we got exactly what we expected - two scoped attributes
final Collection<?> f = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(f.size(), 2);
- Assert.assertTrue(
+ assertEquals(f.size(), 2);
+ assertTrue(
f.contains(new ScopedStringAttributeValue(TestSources.COMMON_ATTRIBUTE_VALUE_STRING, TEST_SCOPE)),
"looking for COMMON_ATTRIBUTE_VALUE");
- Assert.assertTrue(
+ assertTrue(
f.contains(new ScopedStringAttributeValue(TestSources.COMMON_ATTRIBUTE_VALUE_STRING, TEST_SCOPE)),
"looking for CONNECTOR_ATTRIBUTE_VALUE");
@@ -122,7 +126,7 @@ public class ScopedAttributeTest {
try {
attrDef.resolve(resolutionContext);
- Assert.fail("Invalid type");
+ fail("Invalid type");
} catch (final ResolutionException e) {
//
}
@@ -152,9 +156,9 @@ public class ScopedAttributeTest {
final Collection f = result.getValues();
- Assert.assertEquals(f.size(), 2);
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("one", TEST_SCOPE)));
- Assert.assertTrue(f.contains(new ScopedStringAttributeValue("three", TEST_SCOPE)));
+ assertEquals(f.size(), 2);
+ assertTrue(f.contains(new ScopedStringAttributeValue("one", TEST_SCOPE)));
+ assertTrue(f.contains(new ScopedStringAttributeValue("three", TEST_SCOPE)));
}
@@ -170,35 +174,35 @@ public class ScopedAttributeTest {
try {
attrDef.setScope(null);
- Assert.fail("set null delimiter");
+ fail("set null delimiter");
} catch (final ConstraintViolationException e) {
// OK
}
attrDef = new ScopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
- Assert.assertNull(attrDef.getScope());
+ assertNull(attrDef.getScope());
attrDef.setScope(TEST_SCOPE);
try {
attrDef.initialize();
- Assert.fail("no Dependency - should fail");
+ fail("no Dependency - should fail");
} catch (final ComponentInitializationException e) {
// OK
}
attrDef = new ScopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
- Assert.assertNull(attrDef.getScope());
+ assertNull(attrDef.getScope());
attrDef.setDataConnectorDependencies(pluginDependencies);
try {
attrDef.initialize();
- Assert.fail("no Scope - should fail");
+ fail("no Scope - should fail");
} catch (final ComponentInitializationException e) {
// OK
}
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("resolve not initialized");
+ fail("resolve not initialized");
} catch (final UninitializedComponentException e) {
// OK
}
@@ -206,11 +210,11 @@ public class ScopedAttributeTest {
attrDef.setScope(TEST_SCOPE);
attrDef.initialize();
- Assert.assertEquals(attrDef.getScope(), TEST_SCOPE);
+ assertEquals(attrDef.getScope(), TEST_SCOPE);
try {
attrDef.resolve(null);
- Assert.fail("Null context not allowed");
+ fail("Null context not allowed");
} catch (final ConstraintViolationException e) {
// OK
}
@@ -218,22 +222,22 @@ public class ScopedAttributeTest {
attrDef.destroy();
try {
attrDef.initialize();
- Assert.fail("Init after destroy");
+ fail("Init after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("Resolve after destroy");
+ fail("Resolve after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
try {
attrDef.setScope(TEST_SCOPE);
- Assert.fail("Set Delimiter after destroy");
+ fail("Set Delimiter after destroy");
} catch (final DestroyedComponentException e) {
// OK
}
}
-}
\ No newline at end of file
+}
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 03ccf46..040ee1c 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
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -37,7 +43,6 @@ import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -112,18 +117,18 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simple.script")));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertTrue(test.equals(val), "Scripted result is the same as bases");
- Assert.assertEquals(results.size(), 1, "Scripted result value count");
- Assert.assertEquals(results.iterator().next().getValue(), SIMPLE_VALUE, "Scripted result contains known value");
+ assertTrue(test.equals(val), "Scripted result is the same as bases");
+ assertEquals(results.size(), 1, "Scripted result value count");
+ assertEquals(results.iterator().next().getValue(), SIMPLE_VALUE, "Scripted result contains known value");
}
/**
@@ -141,21 +146,21 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("subjects.script")));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertTrue(test.equals(val), "Scripted result is the same as bases");
- Assert.assertEquals(results.size(), 4, "Scripted result value count");
- Assert.assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE)));
- Assert.assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"2")));
- Assert.assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"3")));
- Assert.assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"4")));
+ assertTrue(test.equals(val), "Scripted result is the same as bases");
+ assertEquals(results.size(), 4, "Scripted result value count");
+ assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE)));
+ assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"2")));
+ assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"3")));
+ assertTrue(results.contains(new StringAttributeValue(SIMPLE_VALUE+"4")));
}
@@ -171,19 +176,19 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("custom.script")));
attr.setCustomObject(test.getValues().get(0));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertTrue(test.equals(val), "Scripted result is the same as bases");
- Assert.assertEquals(results.size(), 1, "Scripted result value count");
- Assert.assertEquals(results.get(0).getValue(), SIMPLE_VALUE, "Scripted result contains known value");
+ assertTrue(test.equals(val), "Scripted result is the same as bases");
+ assertEquals(results.size(), 1, "Scripted result value count");
+ assertEquals(results.get(0).getValue(), SIMPLE_VALUE, "Scripted result contains known value");
}
/**
@@ -202,18 +207,18 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simple2.script", false)));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertTrue(test.equals(val), "Scripted result is the same as bases");
- Assert.assertEquals(results.size(), 1, "Scripted result value count");
- Assert.assertEquals(results.iterator().next().getValue(), SIMPLE_VALUE, "Scripted result contains known value");
+ assertTrue(test.equals(val), "Scripted result is the same as bases");
+ assertEquals(results.size(), 1, "Scripted result value count");
+ assertEquals(results.iterator().next().getValue(), SIMPLE_VALUE, "Scripted result contains known value");
}
@Test public void nullValue() throws ResolutionException, ComponentInitializationException, ScriptException,
@@ -224,17 +229,17 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("nullValue.script", false)));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertEquals(results.size(), 1, "Scripted result value count");
- Assert.assertEquals(results.iterator().next(), new EmptyAttributeValue(EmptyType.NULL_VALUE),
+ assertEquals(results.size(), 1, "Scripted result value count");
+ assertEquals(results.iterator().next(), new EmptyAttributeValue(EmptyType.NULL_VALUE),
"Scripted result contains expected value");
}
@@ -245,7 +250,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(new StringAttributeValue(SIMPLE_VALUE)));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("logging.script", false)));
attr.initialize();
@@ -253,7 +258,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertEquals(results.size(), 2, "Scripted result value count");
+ assertEquals(results.size(), 2, "Scripted result value count");
}
@Test public void simpleWithPredef() throws ResolutionException, ComponentInitializationException, ScriptException,
@@ -265,18 +270,18 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
test.setValues(Collections.singletonList(attributeValue));
final ScriptedAttributeDefinition attr = new ScriptedAttributeDefinition();
- Assert.assertNull(attr.getScript());
+ assertNull(attr.getScript());
attr.setId(TEST_ATTRIBUTE_NAME);
attr.setScript(new EvaluableScript(SCRIPT_LANGUAGE, getScript("simpleWithPredef.script", false)));
attr.initialize();
- Assert.assertNotNull(attr.getScript());
+ assertNotNull(attr.getScript());
final IdPAttribute val = attr.resolve(generateContext());
final List<IdPAttributeValue<?>> results = val.getValues();
- Assert.assertTrue(test.equals(val), "Scripted result is the same as bases");
- Assert.assertEquals(results.size(), 1, "Scripted result value count");
- Assert.assertEquals(results.iterator().next(), attributeValue, "Scripted result contains known value");
+ assertTrue(test.equals(val), "Scripted result is the same as bases");
+ assertEquals(results.size(), 1, "Scripted result value count");
+ assertEquals(results.iterator().next(), attributeValue, "Scripted result contains known value");
}
private ScriptedAttributeDefinition buildTest(final String failingScript, final boolean v8Safe) throws ScriptException,
@@ -286,7 +291,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
attr.setId(TEST_ATTRIBUTE_NAME);
try {
attr.initialize();
- Assert.fail("No script defined");
+ fail("No script defined");
} catch (final ComponentInitializationException ex) {
// OK
}
@@ -301,7 +306,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
IOException, ComponentInitializationException {
try {
buildTest(failingScript, v8Safe).resolve(generateContext());
- Assert.fail("Script: '" + failingScript + "' should have thrown an exception: " + failingMessage);
+ fail("Script: '" + failingScript + "' should have thrown an exception: " + failingMessage);
} catch (final ResolutionException ex) {
log.trace("Successful exception", ex);
} catch (final RuntimeException ex) {
@@ -321,7 +326,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
failureTest("fail2.script", "Bad output type", true);
if (!TestSupport.isJavaV8OrLater()) {
// nashhorn is much more forgiving - and we tested for most of this in fails2
- Assert.assertNull(buildTest("fail3.script", true).resolve(generateContext()), "returns nothing");
+ assertNull(buildTest("fail3.script", true).resolve(generateContext()), "returns nothing");
}
failureTest("fail4.script", "getValues, then getNativeAttributes", true);
@@ -335,8 +340,8 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final IdPAttribute result = buildTest("addAfterGetValues.script", true).resolve(generateContext());
final List<IdPAttributeValue<?>> values = result.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("newValue")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("newValue")));
}
/**
@@ -375,9 +380,9 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final IdPAttribute attribute = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME);
final List<IdPAttributeValue<?>> values = attribute.getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
- Assert.assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
+ assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT));
}
/**
@@ -412,9 +417,9 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final List<IdPAttributeValue<?>> outValues = result.getValues();
- Assert.assertEquals(outValues.size(), 2);
- Assert.assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
- Assert.assertTrue(values.contains(new EmptyAttributeValue(EmptyType.NULL_VALUE)));
+ assertEquals(outValues.size(), 2);
+ assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
+ assertTrue(values.contains(new EmptyAttributeValue(EmptyType.NULL_VALUE)));
}
@Test public void nonString() throws ResolutionException, ComponentInitializationException, ScriptException,
@@ -446,10 +451,10 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final IdPAttribute attribute = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME);
final List<IdPAttributeValue<?>> values = attribute.getValues();
- Assert.assertEquals(values.size(), 2);
+ assertEquals(values.size(), 2);
for (final IdPAttributeValue value : values) {
if (!(value instanceof XMLObjectAttributeValue)) {
- Assert.fail("Wrong type: " + value.getClass().getName());
+ fail("Wrong type: " + value.getClass().getName());
}
}
}
@@ -492,18 +497,18 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final IdPAttribute attribute = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME);
final Collection<IdPAttributeValue<?>> values = attribute.getValues();
- Assert.assertEquals(values.size(), 5, "looking for context");
- Assert.assertTrue(values.contains(new StringAttributeValue("AttributeResolutionContext")));
- Assert.assertTrue(values.contains(new StringAttributeValue("ProfileRequestContext")));
- Assert.assertTrue(values.contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
- Assert.assertTrue(values.contains(new StringAttributeValue(TestSources.IDP_ENTITY_ID)));
- Assert.assertTrue(values.contains(new StringAttributeValue(TestSources.SP_ENTITY_ID)));
+ assertEquals(values.size(), 5, "looking for context");
+ assertTrue(values.contains(new StringAttributeValue("AttributeResolutionContext")));
+ assertTrue(values.contains(new StringAttributeValue("ProfileRequestContext")));
+ assertTrue(values.contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
+ assertTrue(values.contains(new StringAttributeValue(TestSources.IDP_ENTITY_ID)));
+ assertTrue(values.contains(new StringAttributeValue(TestSources.SP_ENTITY_ID)));
}
protected IdPAttribute runExample(final String exampleScript, final String exampleData, final String attributeName)
@@ -534,7 +539,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
return context.getResolvedIdPAttributes().get(attributeName);
@@ -545,42 +550,42 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
IdPAttribute attribute = runExample("example1.script", "example1.attribute.xml", "swissEduPersonUniqueID");
- Assert.assertEquals(attribute.getValues().iterator().next().getValue(),
+ assertEquals(attribute.getValues().iterator().next().getValue(),
DigestUtils.md5Hex("12345678some#salt#value#12345679") + "@switch.ch");
attribute = runExample("example2.script", "example2.attribute.xml", "eduPersonAffiliation");
HashSet<IdPAttributeValue> set = new HashSet(attribute.getValues());
- Assert.assertEquals(set.size(), 3);
- Assert.assertTrue(set.contains(new StringAttributeValue("affiliate")));
- Assert.assertTrue(set.contains(new StringAttributeValue("student")));
- Assert.assertTrue(set.contains(new StringAttributeValue("staff")));
+ assertEquals(set.size(), 3);
+ assertTrue(set.contains(new StringAttributeValue("affiliate")));
+ assertTrue(set.contains(new StringAttributeValue("student")));
+ assertTrue(set.contains(new StringAttributeValue("staff")));
attribute = runExample("example3.script", "example3.attribute.xml", "eduPersonAffiliation");
set = new HashSet(attribute.getValues());
- Assert.assertEquals(set.size(), 2);
- Assert.assertTrue(set.contains(new StringAttributeValue("member")));
- Assert.assertTrue(set.contains(new StringAttributeValue("staff")));
+ assertEquals(set.size(), 2);
+ assertTrue(set.contains(new StringAttributeValue("member")));
+ assertTrue(set.contains(new StringAttributeValue("staff")));
attribute = runExample("example3.script", "example3.attribute.2.xml", "eduPersonAffiliation");
set = new HashSet(attribute.getValues());
- Assert.assertEquals(set.size(), 3);
- Assert.assertTrue(set.contains(new StringAttributeValue("member")));
- Assert.assertTrue(set.contains(new StringAttributeValue("staff")));
- Assert.assertTrue(set.contains(new StringAttributeValue("walkin")));
+ assertEquals(set.size(), 3);
+ assertTrue(set.contains(new StringAttributeValue("member")));
+ assertTrue(set.contains(new StringAttributeValue("staff")));
+ assertTrue(set.contains(new StringAttributeValue("walkin")));
attribute = runExample("example4.script", "example4.attribute.xml", "eduPersonEntitlement");
set = new HashSet(attribute.getValues());
- Assert.assertEquals(set.size(), 1);
- Assert.assertTrue(set.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+ assertEquals(set.size(), 1);
+ assertTrue(set.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
attribute = runExample("example4.script", "example4.attribute.2.xml", "eduPersonEntitlement");
set = new HashSet(attribute.getValues());
- Assert.assertEquals(set.size(), 2);
- Assert.assertTrue(set.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
- Assert.assertTrue(set.contains(new StringAttributeValue("LittleGreenMen")));
+ assertEquals(set.size(), 2);
+ assertTrue(set.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+ assertTrue(set.contains(new StringAttributeValue("LittleGreenMen")));
attribute = runExample("example4.script", "example4.attribute.3.xml", "eduPersonEntitlement");
- Assert.assertNull(attribute);
+ assertNull(attribute);
}
@@ -594,10 +599,10 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final IdPAttribute result = scripted.resolve(generateContext());
final HashSet<IdPAttributeValue> set = new HashSet(result.getValues());
- Assert.assertEquals(set.size(), 3);
- Assert.assertTrue(set.contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
- Assert.assertTrue(set.contains(new StringAttributeValue(TestSources.IDP_ENTITY_ID)));
- Assert.assertTrue(set.contains(new StringAttributeValue(TestSources.SP_ENTITY_ID)));
+ assertEquals(set.size(), 3);
+ assertTrue(set.contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
+ assertTrue(set.contains(new StringAttributeValue(TestSources.IDP_ENTITY_ID)));
+ assertTrue(set.contains(new StringAttributeValue(TestSources.SP_ENTITY_ID)));
}
@@ -610,7 +615,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
scripted.initialize();
final IdPAttribute result = scripted.resolve(generateContext());
- Assert.assertEquals(result.getValues().iterator().next(), new StringAttributeValue("AllDone"));
+ assertEquals(result.getValues().iterator().next(), new StringAttributeValue("AllDone"));
}
@@ -646,4 +651,4 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
}
}
-}
\ No newline at end of file
+}
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 909ae8f..4cbe382 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
@@ -17,13 +17,16 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -61,7 +64,7 @@ public class SimpleAttributeTest {
simple.setId(TEST_ATTRIBUTE_NAME);
try {
simple.initialize();
- Assert.fail("no dependencies");
+ fail("no dependencies");
} catch (final ComponentInitializationException e) {
//OK
}
@@ -72,7 +75,7 @@ public class SimpleAttributeTest {
context.getSubcontext(AttributeResolverWorkContext.class, true);
final IdPAttribute result = simple.resolve(context);
- Assert.assertTrue(result.getValues().isEmpty());
+ assertTrue(result.getValues().isEmpty());
}
/**
@@ -106,13 +109,13 @@ public class SimpleAttributeTest {
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT), "looking for " + TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
- Assert.assertTrue(values.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_RESULT),
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT), "looking for " + TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
+ assertTrue(values.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_RESULT),
"looking for " + TestSources.CONNECTOR_ATTRIBUTE_VALUE_STRING);
}
@@ -144,14 +147,14 @@ public class SimpleAttributeTest {
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection<IdPAttributeValue<?>> values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT),
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT),
"looking for value " + TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
- Assert.assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT),
+ assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT),
"looking for value " + TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING);
}
@@ -181,9 +184,9 @@ public class SimpleAttributeTest {
final IdPAttribute result = simple.resolve(resolutionContext);
final List<IdPAttributeValue<?>> outValues = result.getValues();
- Assert.assertEquals(outValues.size(), 2);
- Assert.assertTrue(outValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
- Assert.assertTrue(outValues.contains(new EmptyAttributeValue(EmptyType.NULL_VALUE)));
+ assertEquals(outValues.size(), 2);
+ assertTrue(outValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT));
+ assertTrue(outValues.contains(new EmptyAttributeValue(EmptyType.NULL_VALUE)));
}
@@ -221,17 +224,17 @@ public class SimpleAttributeTest {
try {
resolver.resolveAttributes(context);
} catch (final ResolutionException e) {
- Assert.fail("resolution failed", e);
+ fail("resolution failed", e);
}
final Collection values = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME).getValues();
- Assert.assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT),
+ assertTrue(values.contains(TestSources.COMMON_ATTRIBUTE_VALUE_RESULT),
"looking for value " + TestSources.COMMON_ATTRIBUTE_VALUE_STRING);
- Assert.assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT),
+ assertTrue(values.contains(TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_RESULT),
"looking for value " + TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING);
- Assert.assertTrue(values.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_RESULT),
+ assertTrue(values.contains(TestSources.CONNECTOR_ATTRIBUTE_VALUE_RESULT),
"looking for value " + TestSources.CONNECTOR_ATTRIBUTE_VALUE_STRING);
- Assert.assertEquals(values.size(), 3);
+ assertEquals(values.size(), 3);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
index 84e7748..b521e2e 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
@@ -17,12 +17,18 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.fail;
+
import java.util.Arrays;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.ad.impl.StaticAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -30,9 +36,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** Tests for {@link StaticAttributeDefinition}
*
*/
@@ -41,14 +44,14 @@ public class StaticAttributeDefinitionTest {
@Test public void resolve() throws ComponentInitializationException, ResolutionException {
StaticAttributeDefinition attrDef = new StaticAttributeDefinition();
attrDef.setId("Static");
- Assert.assertNull(attrDef.getValue());
+ assertNull(attrDef.getValue());
attrDef.setValue(null);
- Assert.assertNull(attrDef.getValue());
+ assertNull(attrDef.getValue());
try {
attrDef.initialize();
- Assert.fail("Cannot initialize without an attribute");
+ fail("Cannot initialize without an attribute");
} catch (ComponentInitializationException e) {
//OK
}
@@ -57,29 +60,29 @@ public class StaticAttributeDefinitionTest {
attribute.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
attrDef.setValue(attribute);
- Assert.assertNotNull(attrDef.getValue());
+ assertNotNull(attrDef.getValue());
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail("Need to be initialized to resolve");
+ fail("Need to be initialized to resolve");
} catch (UninitializedComponentException e) {
// OK
}
attrDef.initialize();
- Assert.assertNotNull(attrDef.getValue());
+ assertNotNull(attrDef.getValue());
final AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
IdPAttribute result = attrDef.resolve(context);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.getId(), "attribute");
+ assertNotNull(result);
+ assertEquals(result.getId(), "attribute");
try {
attrDef.setValue(new IdPAttribute("other"));
- Assert.fail();
+ fail();
} catch (UnmodifiableComponentException e) {
// OK
}
@@ -88,14 +91,14 @@ public class StaticAttributeDefinitionTest {
try {
attrDef.initialize();
- Assert.fail();
+ fail();
} catch (DestroyedComponentException e) {
//OK
}
try {
attrDef.setValue(new IdPAttribute("other"));
- Assert.fail();
+ fail();
} catch (UnmodifiableComponentException e) {
// OK
} catch (DestroyedComponentException e) {
@@ -104,11 +107,11 @@ public class StaticAttributeDefinitionTest {
try {
attrDef.resolve(new AttributeResolutionContext());
- Assert.fail();
+ fail();
} catch (DestroyedComponentException e) {
// OK
}
}
-}
\ No newline at end of file
+}
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 4dbc771..0b94479 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
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -27,7 +33,6 @@ import java.util.Set;
import javax.annotation.concurrent.ThreadSafe;
import org.apache.velocity.app.VelocityEngine;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -91,7 +96,7 @@ public class TemplateAttributeTest {
engineSingleton.addProperty("resource.loader", "classpath, string");
engineSingleton.init();
} catch (final Exception e) {
- Assert.fail("couldn't create engine", e);
+ fail("couldn't create engine", e);
}
}
return engineSingleton;
@@ -108,23 +113,23 @@ public class TemplateAttributeTest {
final String name = TEST_ATTRIBUTE_BASE_NAME + "1";
TemplateAttributeDefinition attr = new TemplateAttributeDefinition();
attr.setId(name);
- Assert.assertNull(attr.getTemplate());
+ assertNull(attr.getTemplate());
attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
try {
attr.initialize();
- Assert.fail("No template");
+ fail("No template");
} catch (final ComponentInitializationException ex) {
// OK
}
attr = new TemplateAttributeDefinition();
attr.setId(name);
- Assert.assertNull(attr.getTemplateText());
+ assertNull(attr.getTemplateText());
attr.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
- Assert.assertNull(attr.getVelocityEngine());
+ assertNull(attr.getVelocityEngine());
attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
try {
attr.initialize();
- Assert.fail("engine");
+ fail("engine");
} catch (final ComponentInitializationException ex) {
// OK
}
@@ -135,22 +140,22 @@ public class TemplateAttributeTest {
attr.setTemplateText(TEST_ATTRIBUTES_TEMPLATE_ATTR);
try {
attr.initialize();
- Assert.fail("No dependencies");
+ fail("No dependencies");
} catch (final ComponentInitializationException ex) {
// OK
}
- Assert.assertNotNull(attr.getTemplateText());
+ assertNotNull(attr.getTemplateText());
attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", "bar")));
attr.initialize();
- Assert.assertNotNull(attr.getTemplate());
+ assertNotNull(attr.getTemplate());
final AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
final IdPAttribute val = attr.resolve(context);
final Collection<?> results = val.getValues();
- Assert.assertEquals(results.size(), 0, "Templated value count");
+ assertEquals(results.size(), 0, "Templated value count");
attr = new TemplateAttributeDefinition();
attr.setId(name);
@@ -160,7 +165,7 @@ public class TemplateAttributeTest {
attr.setSourceAttributes(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
attr.initialize();
- Assert.assertNotNull(attr.getTemplate());
+ assertNotNull(attr.getTemplate());
try {
attr.resolve(context);
} catch (final ResolutionException e) {
@@ -173,16 +178,16 @@ public class TemplateAttributeTest {
attr.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("foo", TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
try {
attr.initialize();
- Assert.fail("No Text or attributes");
+ fail("No Text or attributes");
} catch (final ComponentInitializationException ex) {
// OK
}
attr.setSourceAttributes(Collections.singletonList(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR));
attr.setTemplateText( "${" + TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "}");
attr.initialize();
- Assert.assertEquals(attr.getTemplateText(), "${" + TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "}");
- Assert.assertEquals(attr.getSourceAttributes().get(0), TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
- Assert.assertEquals(attr.getSourceAttributes().size(), 1);
+ assertEquals(attr.getTemplateText(), "${" + TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR + "}");
+ assertEquals(attr.getSourceAttributes().get(0), TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR);
+ assertEquals(attr.getSourceAttributes().size(), 1);
}
@@ -220,8 +225,8 @@ public class TemplateAttributeTest {
final IdPAttribute a = context.getResolvedIdPAttributes().get(name);
final Collection results = a.getValues();
- Assert.assertEquals(results.size(), 1, "Templated value count");
- Assert.assertTrue(results.contains(SIMPLE_VALUE_RESULT), "Single value context is correct");
+ assertEquals(results.size(), 1, "Templated value count");
+ assertTrue(results.contains(SIMPLE_VALUE_RESULT), "Single value context is correct");
}
@@ -294,13 +299,13 @@ public class TemplateAttributeTest {
final IdPAttribute a = context.getResolvedIdPAttributes().get(name);
final Collection results = a.getValues();
- Assert.assertEquals(results.size(), 2, "Templated value count");
+ assertEquals(results.size(), 2, "Templated value count");
String s =
"Att " + TestSources.COMMON_ATTRIBUTE_VALUE_STRING + "-"
+ TestSources.SECOND_ATTRIBUTE_VALUE_STRINGS[0];
- Assert.assertTrue(results.contains(new StringAttributeValue(s)), "First Match");
+ assertTrue(results.contains(new StringAttributeValue(s)), "First Match");
s = "Att " + TestSources.ATTRIBUTE_ATTRIBUTE_VALUE_STRING + "-" + TestSources.SECOND_ATTRIBUTE_VALUE_STRINGS[1];
- Assert.assertTrue(results.contains(new StringAttributeValue(s)), "Second Match");
+ assertTrue(results.contains(new StringAttributeValue(s)), "Second Match");
}
@Test public void emptyValues() throws ResolutionException, ComponentInitializationException {
@@ -338,9 +343,9 @@ public class TemplateAttributeTest {
final IdPAttribute a = context.getResolvedIdPAttributes().get(name);
final Collection results = a.getValues();
- Assert.assertEquals(results.size(), 2, "Templated value count");
- Assert.assertTrue(results.contains(new StringAttributeValue("Att ")), "First Match");
- Assert.assertTrue(results.contains(new StringAttributeValue("Att ${at1}")), "Second Match");
+ assertEquals(results.size(), 2, "Templated value count");
+ assertTrue(results.contains(new StringAttributeValue("Att ")), "First Match");
+ assertTrue(results.contains(new StringAttributeValue("Att ${at1}")), "Second Match");
}
@Test public void failMisMatchCount() throws ResolutionException, ComponentInitializationException {
@@ -369,7 +374,7 @@ public class TemplateAttributeTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail();
+ fail();
} catch (final ResolutionException ex) {
// OK
}
@@ -432,7 +437,7 @@ public class TemplateAttributeTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail();
+ fail();
} catch (final ResolutionException ex) {
// OK
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
index 1726495..bba88e1 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
@@ -17,10 +17,15 @@
package net.shibboleth.idp.attribute.resolver.ad.mapped.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.Collections;
import java.util.Set;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -45,11 +50,11 @@ public class MappedAttributeTest {
final MappedAttributeDefinition definition = new MappedAttributeDefinition();
definition.setId(TEST_ATTRIBUTE_NAME);
- Assert.assertFalse(definition.isPassThru());
+ assertFalse(definition.isPassThru());
try {
definition.initialize();
- Assert.fail("Initialized without dependencies and value mappings");
+ fail("Initialized without dependencies and value mappings");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -61,7 +66,7 @@ public class MappedAttributeTest {
try {
definition.initialize();
- Assert.fail("Initialized without value mappings");
+ fail("Initialized without value mappings");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -73,14 +78,14 @@ public class MappedAttributeTest {
definition.destroy();
try {
definition.initialize();
- Assert.fail("init a torn down mapper?");
+ fail("init a torn down mapper?");
} catch (final DestroyedComponentException e) {
// expected this
}
try {
definition.resolve(new AttributeResolutionContext());
- Assert.fail("resolve a torn down mapper?");
+ fail("resolve a torn down mapper?");
} catch (final DestroyedComponentException e) {
// expected this
}
@@ -102,8 +107,8 @@ public class MappedAttributeTest {
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
- Assert.assertTrue(result.getValues().isEmpty());
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertTrue(result.getValues().isEmpty());
}
@Test public void noAttributeValuesDefault() throws Exception {
@@ -119,16 +124,16 @@ public class MappedAttributeTest {
"NoSuchAttribute")));
definition.setValueMaps(Collections.singleton(substringValueMapping("foo", false, "foo")));
definition.setDefaultValue("");
- Assert.assertNull(definition.getDefaultAttributeValue());
- Assert.assertNull(definition.getDefaultValue());
+ assertNull(definition.getDefaultAttributeValue());
+ assertNull(definition.getDefaultValue());
definition.setDefaultValue("default");
- Assert.assertEquals(definition.getDefaultValue(), "default");
+ assertEquals(definition.getDefaultValue(), "default");
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
- Assert.assertFalse(result.getValues().isEmpty());
- Assert.assertTrue(result.getValues().contains(new StringAttributeValue("default")));
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertFalse(result.getValues().isEmpty());
+ assertTrue(result.getValues().contains(new StringAttributeValue("default")));
}
@Test public void invalidValueType() throws ComponentInitializationException {
@@ -147,7 +152,7 @@ public class MappedAttributeTest {
try {
definition.resolve(resolutionContext);
- Assert.fail("invalid types");
+ fail("invalid types");
} catch (final ResolutionException e) {
//
}
@@ -165,15 +170,15 @@ public class MappedAttributeTest {
definition.setId(TEST_ATTRIBUTE_NAME);
definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
- Assert.assertTrue(definition.getValueMaps().isEmpty());
+ assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("student", false, "student")));
- Assert.assertEquals(definition.getValueMaps().size(), 1);
+ assertEquals(definition.getValueMaps().size(), 1);
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
// mapped attribute definition should return no values for empty and null
- Assert.assertTrue(result.getValues().isEmpty());
+ assertTrue(result.getValues().isEmpty());
}
@Test public void validValueType() throws Exception {
@@ -187,17 +192,17 @@ public class MappedAttributeTest {
definition.setId(TEST_ATTRIBUTE_NAME);
definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
- Assert.assertTrue(definition.getValueMaps().isEmpty());
+ assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("student", false, "student")));
- Assert.assertEquals(definition.getValueMaps().size(), 1);
+ assertEquals(definition.getValueMaps().size(), 1);
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
- Assert.assertFalse(result.getValues().isEmpty());
- Assert.assertEquals(result.getValues().size(), 2);
- Assert.assertTrue(result.getValues().get(0).equals(new StringAttributeValue("student")));
- Assert.assertTrue(result.getValues().get(1).equals(new StringAttributeValue("student")));
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertFalse(result.getValues().isEmpty());
+ assertEquals(result.getValues().size(), 2);
+ assertTrue(result.getValues().get(0).equals(new StringAttributeValue("student")));
+ assertTrue(result.getValues().get(1).equals(new StringAttributeValue("student")));
}
@Test public void defaultCase() throws Exception {
@@ -211,20 +216,20 @@ public class MappedAttributeTest {
definition.setId(TEST_ATTRIBUTE_NAME);
definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
- Assert.assertTrue(definition.getValueMaps().isEmpty());
+ assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
definition.setDefaultValue("default");
- Assert.assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
- Assert.assertFalse(definition.isPassThru());
+ assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
+ assertFalse(definition.isPassThru());
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
- Assert.assertFalse(result.getValues().isEmpty());
- Assert.assertEquals(result.getValues().size(), 3);
- Assert.assertTrue(result.getValues().get(0).equals(new StringAttributeValue("default")));
- Assert.assertTrue(result.getValues().get(1).equals(new StringAttributeValue("default")));
- Assert.assertTrue(result.getValues().get(2).equals(new StringAttributeValue("default")));
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertFalse(result.getValues().isEmpty());
+ assertEquals(result.getValues().size(), 3);
+ assertTrue(result.getValues().get(0).equals(new StringAttributeValue("default")));
+ assertTrue(result.getValues().get(1).equals(new StringAttributeValue("default")));
+ assertTrue(result.getValues().get(2).equals(new StringAttributeValue("default")));
}
@Test public void passThrough() throws Exception {
@@ -238,19 +243,19 @@ public class MappedAttributeTest {
definition.setId(TEST_ATTRIBUTE_NAME);
definition.setDataConnectorDependencies(Collections.singleton(TestSources.makeDataConnectorDependency("connector1",
ResolverTestSupport.EPA_ATTRIB_ID)));
- Assert.assertTrue(definition.getValueMaps().isEmpty());
+ assertTrue(definition.getValueMaps().isEmpty());
definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
definition.setDefaultValue("default");
- Assert.assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
+ assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
definition.setPassThru(true);
definition.initialize();
final IdPAttribute result = definition.resolve(resolutionContext);
- Assert.assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
- Assert.assertFalse(result.getValues().isEmpty());
- Assert.assertEquals(result.getValues().size(), ResolverTestSupport.EPA3_VALUES.length);
+ assertEquals(result.getId(), TEST_ATTRIBUTE_NAME);
+ assertFalse(result.getValues().isEmpty());
+ assertEquals(result.getValues().size(), ResolverTestSupport.EPA3_VALUES.length);
for (final String val : ResolverTestSupport.EPA3_VALUES) {
- Assert.assertTrue(result.getValues().contains(new StringAttributeValue(val)));
+ assertTrue(result.getValues().contains(new StringAttributeValue(val)));
}
}
@@ -288,4 +293,4 @@ public class MappedAttributeTest {
definition.resolve(resolutionContext);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValueTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValueTest.java
index 43a9a55..d4cfecf 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValueTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValueTest.java
@@ -17,13 +17,16 @@
package net.shibboleth.idp.attribute.resolver.ad.mapped.impl;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* test for {@link SourceValue}.
*/
@@ -34,17 +37,17 @@ public class SourceValueTest {
@Test public void sourceValue() throws ComponentInitializationException {
SourceValue value = newSourceValue("value", false, true);
- Assert.assertEquals(value.getValue(), "value");
- Assert.assertTrue(value.isPartialMatch());
- Assert.assertFalse(value.isIgnoreCase());
+ assertEquals(value.getValue(), "value");
+ assertTrue(value.isPartialMatch());
+ assertFalse(value.isIgnoreCase());
log.info("Value = 'value', ignore = true, partial = false", value.toString());
value = newSourceValue("eulaV", true, false);
- Assert.assertEquals(value.getPattern().pattern(), "eulaV");
- Assert.assertFalse(value.isPartialMatch());
- Assert.assertTrue(value.isIgnoreCase());
+ assertEquals(value.getPattern().pattern(), "eulaV");
+ assertFalse(value.isPartialMatch());
+ assertTrue(value.isIgnoreCase());
log.info("Value = 'eulaV', ignore = false, partial = true", value.toString());
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMapTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMapTest.java
index 835bff0..49cbc74 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMapTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMapTest.java
@@ -17,16 +17,18 @@
package net.shibboleth.idp.attribute.resolver.ad.mapped.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link ValueMap}.
*/
@@ -42,9 +44,9 @@ public class ValueMapTest {
map.setReturnValue("return");
- Assert.assertEquals(map.getReturnValue(), "return");
- Assert.assertEquals(map.getSourceValues().size(), 1);
- Assert.assertTrue(map.getSourceValues().contains(value));
+ assertEquals(map.getReturnValue(), "return");
+ assertEquals(map.getSourceValues().size(), 1);
+ assertTrue(map.getSourceValues().contains(value));
}
@Test public void subString() throws ComponentInitializationException {
@@ -57,11 +59,11 @@ public class ValueMapTest {
Set<StringAttributeValue> result = map.apply("elephant");
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
result = map.apply("elephantvaluegiraffe");
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(new StringAttributeValue("return")));
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(new StringAttributeValue("return")));
}
@Test public void regexp() throws ComponentInitializationException {
@@ -74,12 +76,12 @@ public class ValueMapTest {
map.setReturnValue("foo$1");
Set<StringAttributeValue> result = map.apply("elephant");
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
result = map.apply("Recursion");
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(new StringAttributeValue("fooecursion")));
- Assert.assertTrue(result.contains(new StringAttributeValue("foocursion")));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(new StringAttributeValue("fooecursion")));
+ assertTrue(result.contains(new StringAttributeValue("foocursion")));
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
index aa458c2..d10b3a6 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
@@ -17,6 +17,9 @@
package net.shibboleth.idp.attribute.resolver.dc.http.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -28,7 +31,6 @@ import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolverTest;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
import org.opensaml.security.httpclient.impl.SecurityEnhancedHttpClientSupport;
import org.springframework.core.io.ClassPathResource;
-import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -96,14 +98,14 @@ public class HTTPDataConnectorTest {
final Map<String,IdPAttribute> attrs = connector.resolve(context);
- Assert.assertEquals(attrs.size(), 2);
+ assertEquals(attrs.size(), 2);
- Assert.assertEquals(attrs.get("foo").getValues().size(), 1);
- Assert.assertEquals(attrs.get("foo").getValues().get(0).getValue(), "foo1");
+ assertEquals(attrs.get("foo").getValues().size(), 1);
+ assertEquals(attrs.get("foo").getValues().get(0).getValue(), "foo1");
- Assert.assertEquals(attrs.get("bar").getValues().size(), 2);
- Assert.assertEquals(attrs.get("bar").getValues().get(0).getValue(), "bar1");
- Assert.assertEquals(attrs.get("bar").getValues().get(1).getValue(), "bar2");
+ assertEquals(attrs.get("bar").getValues().size(), 2);
+ assertEquals(attrs.get("bar").getValues().get(0).getValue(), "bar1");
+ assertEquals(attrs.get("bar").getValues().get(1).getValue(), "bar2");
}
@Test(expectedExceptions=ResolutionException.class) public void testBadProtocol()
@@ -213,7 +215,7 @@ public class HTTPDataConnectorTest {
final Map<String,IdPAttribute> attrs = connector.resolve(context);
- Assert.assertTrue(attrs == null || attrs.isEmpty());
+ assertTrue(attrs == null || attrs.isEmpty());
}
@Test public void resolveWithCache() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
@@ -240,10 +242,10 @@ public class HTTPDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- Assert.assertTrue(cache.size() == 0);
+ assertTrue(cache.size() == 0);
final Map<String,IdPAttribute> optional = connector.resolve(context);
- Assert.assertTrue(cache.size() == 1);
- Assert.assertEquals(cache.iterator().next(), optional);
+ assertTrue(cache.size() == 1);
+ assertEquals(cache.iterator().next(), optional);
}
@Test(enabled=false) public void testPOST() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
@@ -270,14 +272,14 @@ public class HTTPDataConnectorTest {
final Map<String,IdPAttribute> attrs = connector.resolve(context);
- Assert.assertEquals(attrs.size(), 2);
+ assertEquals(attrs.size(), 2);
- Assert.assertEquals(attrs.get("foo").getValues().size(), 1);
- Assert.assertEquals(attrs.get("foo").getValues().get(0).getValue(), "foo1");
+ assertEquals(attrs.get("foo").getValues().size(), 1);
+ assertEquals(attrs.get("foo").getValues().get(0).getValue(), "foo1");
- Assert.assertEquals(attrs.get("bar").getValues().size(), 2);
- Assert.assertEquals(attrs.get("bar").getValues().get(0).getValue(), "bar1");
- Assert.assertEquals(attrs.get("bar").getValues().get(1).getValue(), "bar2");
+ assertEquals(attrs.get("bar").getValues().size(), 2);
+ assertEquals(attrs.get("bar").getValues().get(0).getValue(), "bar1");
+ assertEquals(attrs.get("bar").getValues().get(1).getValue(), "bar2");
}
@Test(enabled=false) public void testCacheable() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
@@ -307,10 +309,10 @@ public class HTTPDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- Assert.assertTrue(cache.size() == 0);
+ assertTrue(cache.size() == 0);
final Map<String,IdPAttribute> optional = connector.resolve(context);
- Assert.assertTrue(cache.size() == 1);
- Assert.assertEquals(cache.iterator().next(), optional);
+ assertTrue(cache.size() == 1);
+ assertEquals(cache.iterator().next(), optional);
}
@Test(enabled=false) public void testUncacheable() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
@@ -339,9 +341,9 @@ public class HTTPDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- Assert.assertTrue(cache.size() == 0);
+ assertTrue(cache.size() == 0);
connector.resolve(context);
- Assert.assertTrue(cache.size() == 0);
+ assertTrue(cache.size() == 0);
}
-}
\ No newline at end of file
+}
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 461dfcb..e9c39f1 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
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.dc.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -25,7 +30,6 @@ import java.util.Map;
import java.util.Set;
import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -74,7 +78,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
private static void testInit(final PairwiseIdDataConnector connector, final String failMessage) {
try {
connector.initialize();
- Assert.fail(failMessage);
+ fail(failMessage);
} catch (final ComponentInitializationException e) {
// OK
}
@@ -119,8 +123,8 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected - two scoped attributes
final List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
- Assert.assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
+ assertEquals(resultValues.size(), 1);
+ assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
}
private AttributeResolver constructResolver(final int values) throws ComponentInitializationException {
@@ -223,8 +227,8 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
- Assert.assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
+ assertEquals(resultValues.size(), 1);
+ assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
//
// now do it again with more values
@@ -241,7 +245,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
// No equality test since we don't know which attribute will be returned
resultValues = context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
+ assertEquals(resultValues.size(), 1);
//
// And again with different values
@@ -256,8 +260,8 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected - two scoped attributes
resultValues = context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
- Assert.assertNotEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
+ assertEquals(resultValues.size(), 1);
+ assertNotEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(), RESULT);
}
@@ -269,7 +273,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
AttributeResolutionContext context = TestSources.createResolutionContext(null, null, TestSources.SP_ENTITY_ID);;
resolver.resolveAttributes(context);
- Assert.assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
resolver = constructResolver(0);
connectorFromResolver(resolver).initialize();
@@ -277,7 +281,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, TestSources.SP_ENTITY_ID);
resolver.resolveAttributes(context);
- Assert.assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
resolver = constructResolver(1);
@@ -285,7 +289,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
ComponentSupport.initialize(resolver);
resolver.resolveAttributes(TestSources.createResolutionContext(null, null, null));
- Assert.assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
resolver = constructResolverWithNonString("nonString");
connectorFromResolver(resolver).initialize();
@@ -293,7 +297,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, TestSources.SP_ENTITY_ID);
resolver.resolveAttributes(context);
- Assert.assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME));
}
@Test public void case425() throws ComponentInitializationException, ResolutionException {
@@ -331,7 +335,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
+ assertEquals(resultValues.size(), 1);
}
@@ -365,7 +369,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
connector.initialize();
- Assert.assertNull(connector.resolve(resolutionContext));
+ assertNull(connector.resolve(resolutionContext));
}
@Test public void emptyValue() throws ComponentInitializationException, ResolutionException {
@@ -398,7 +402,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
final Map<String, IdPAttribute> result = connector.resolve(resolutionContext);
- Assert.assertNull(result);
+ assertNull(result);
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
index d977eb7..bdaeead 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
@@ -17,12 +17,20 @@
package net.shibboleth.idp.attribute.resolver.dc.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import javax.annotation.Nullable;
+import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
+import org.opensaml.saml.saml2.core.Attribute;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -32,12 +40,6 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
-import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for the {@link SAMLAttributeDataConnector}
*/
@@ -57,16 +59,16 @@ public class SAMLAttributeDataConnectorTest extends XMLObjectBaseTestCase {
final AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
final Map<String, IdPAttribute> attributes = connector.resolve(context);
- Assert.assertEquals(attributes.size(), 2);
+ assertEquals(attributes.size(), 2);
List<IdPAttributeValue<?>> attributeValues = attributes.get("SamlName").getValues();
- Assert.assertEquals(attributeValues.size(), 1);
- Assert.assertTrue(attributeValues.iterator().next() instanceof XMLObjectAttributeValue);
+ assertEquals(attributeValues.size(), 1);
+ assertTrue(attributeValues.iterator().next() instanceof XMLObjectAttributeValue);
attributeValues = attributes.get("MultiName").getValues();
- Assert.assertEquals(attributeValues.size(), 3);
+ assertEquals(attributeValues.size(), 3);
for (IdPAttributeValue val: attributeValues) {
- Assert.assertTrue(val instanceof StringAttributeValue);
+ assertTrue(val instanceof StringAttributeValue);
}
}
@@ -84,4 +86,4 @@ public class SAMLAttributeDataConnectorTest extends XMLObjectBaseTestCase {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
index 376ff6d..15a21c9 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
@@ -17,6 +17,9 @@
package net.shibboleth.idp.attribute.resolver.dc.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
@@ -26,6 +29,9 @@ import java.util.Map;
import javax.script.ScriptException;
import javax.security.auth.Subject;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -40,10 +46,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import net.shibboleth.utilities.java.support.testing.TestSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link ScriptedDataConnector}
*
@@ -101,28 +103,28 @@ public class ScriptedDataConnectorTest {
context.getSubcontext(AttributeResolverWorkContext.class, true);
final Map<String, IdPAttribute> result = connector.resolve(context);
- Assert.assertEquals(result.size(), 4);
+ assertEquals(result.size(), 4);
List<IdPAttributeValue<?>> values = result.get("ScriptedOne").getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("Value 1")));
- Assert.assertTrue(values.contains(new StringAttributeValue("Value 2")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("Value 1")));
+ assertTrue(values.contains(new StringAttributeValue("Value 2")));
values = result.get("TwoScripted").getValues();
- Assert.assertEquals(values.size(), 3);
- Assert.assertTrue(values.contains(new StringAttributeValue("1Value")));
- Assert.assertTrue(values.contains(new StringAttributeValue("2Value")));
- Assert.assertTrue(values.contains(new StringAttributeValue("3Value")));
+ assertEquals(values.size(), 3);
+ assertTrue(values.contains(new StringAttributeValue("1Value")));
+ assertTrue(values.contains(new StringAttributeValue("2Value")));
+ assertTrue(values.contains(new StringAttributeValue("3Value")));
values = result.get("ThreeScripted").getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue(AttributeResolutionContext.class.getSimpleName())));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue(AttributeResolutionContext.class.getSimpleName())));
values = result.get("Subjects").getValues();
- Assert.assertEquals(values.size(), 3);
- Assert.assertTrue(values.contains(new StringAttributeValue("Foo")));
- Assert.assertTrue(values.contains(new StringAttributeValue("Bar")));
- Assert.assertTrue(values.contains(new StringAttributeValue("Toto")));
+ assertEquals(values.size(), 3);
+ assertTrue(values.contains(new StringAttributeValue("Foo")));
+ assertTrue(values.contains(new StringAttributeValue("Bar")));
+ assertTrue(values.contains(new StringAttributeValue("Toto")));
}
@@ -144,8 +146,8 @@ public class ScriptedDataConnectorTest {
context.getSubcontext(AttributeResolverWorkContext.class, true);
final Map<String, IdPAttribute> result = connector.resolve(context);
- Assert.assertEquals(result.size(), 1);
- Assert.assertEquals(result.get(attribute.getId()),attribute);
+ assertEquals(result.size(), 1);
+ assertEquals(result.get(attribute.getId()),attribute);
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
index 7bc371e..d405872 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
@@ -17,26 +17,30 @@
package net.shibboleth.idp.attribute.resolver.dc.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.idp.attribute.resolver.dc.impl.StaticDataConnector;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** Tests for {@link StaticDataConnector}
*
*/
@@ -49,24 +53,24 @@ public class StaticDataConnectorTest {
StaticDataConnector connector = new StaticDataConnector();
connector.setId("Static");
- Assert.assertNull(connector.getAttributes());
+ assertNull(connector.getAttributes());
connector.setValues(null);
- Assert.assertNull(connector.getAttributes());
+ assertNull(connector.getAttributes());
try {
connector.initialize();
- Assert.fail();
+ fail();
} catch (ComponentInitializationException e) {
//OK
}
List<IdPAttribute> input = new ArrayList<>();
connector.setValues(input);
- Assert.assertNotNull(connector.getAttributes());
+ assertNotNull(connector.getAttributes());
input.add(null);
connector.setValues(input);
- Assert.assertNotNull(connector.getAttributes());
+ assertNotNull(connector.getAttributes());
input.add(attribute);
input.add(null);
@@ -75,15 +79,15 @@ public class StaticDataConnectorTest {
connector.setValues(input);
connector.initialize();
- Assert.assertEquals(connector.getAttributes().size(), 2);
+ assertEquals(connector.getAttributes().size(), 2);
final AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
Map<String, IdPAttribute> result = connector.resolve(context);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.containsKey("attribute"));
- Assert.assertTrue(result.containsKey("thingy"));
+ assertEquals(result.size(), 2);
+ assertTrue(result.containsKey("attribute"));
+ assertTrue(result.containsKey("thingy"));
}
@@ -98,7 +102,7 @@ public class StaticDataConnectorTest {
try {
connector.resolve(new AttributeResolutionContext());
- Assert.fail();
+ fail();
} catch (UninitializedComponentException e) {
//OK
}
@@ -110,7 +114,7 @@ public class StaticDataConnectorTest {
try {
connector.setValues(Collections.singletonList(new IdPAttribute("whatever")));
- Assert.fail();
+ fail();
} catch (UnmodifiableComponentException ex) {
// OK
}
@@ -119,7 +123,7 @@ public class StaticDataConnectorTest {
try {
connector.resolve(new AttributeResolutionContext());
- Assert.fail();
+ fail();
} catch (DestroyedComponentException e) {
//OK
}
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 2edaab8..e7bccdf 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
@@ -17,12 +17,21 @@
package net.shibboleth.idp.attribute.resolver.dc.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
+
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import javax.sql.DataSource;
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.DurablePairwiseIdStore;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.PairwiseId;
@@ -36,12 +45,6 @@ import net.shibboleth.idp.testing.DatabaseTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/**
* Test for {@link PairwiseIdDataConnector} with JDBC store.
*/
@@ -100,8 +103,8 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
final List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
- Assert.assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(),
+ assertEquals(resultValues.size(), 1);
+ assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(),
ComputedIDDataConnectorTest.RESULT);
}
@@ -128,7 +131,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
final List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
+ assertEquals(resultValues.size(), 1);
assertIsUUID(((StringAttributeValue) resultValues.iterator().next()).getValue());
}
@@ -140,10 +143,10 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
* @param value what to check.
*/
private void assertIsUUID(final String value) {
- Assert.assertEquals(value.charAt(8), '-');
- Assert.assertEquals(value.charAt(13), '-');
- Assert.assertEquals(value.charAt(18), '-');
- Assert.assertEquals(value.charAt(23), '-');
+ assertEquals(value.charAt(8), '-');
+ assertEquals(value.charAt(13), '-');
+ assertEquals(value.charAt(18), '-');
+ assertEquals(value.charAt(23), '-');
}
@@ -171,8 +174,8 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
List<IdPAttributeValue<?>> resultValues =
context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
- Assert.assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(),
+ assertEquals(resultValues.size(), 1);
+ assertEquals(((StringAttributeValue) resultValues.iterator().next()).getValue(),
ComputedIDDataConnectorTest.RESULT);
// Now void it and try again
@@ -200,9 +203,9 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
// Now test that we got exactly what we expected
resultValues =
context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME).getValues();
- Assert.assertEquals(resultValues.size(), 1);
+ assertEquals(resultValues.size(), 1);
final String val = ((StringAttributeValue) resultValues.iterator().next()).getValue();
- Assert.assertNotEquals(val, ComputedIDDataConnectorTest.RESULT);
+ assertNotEquals(val, ComputedIDDataConnectorTest.RESULT);
assertIsUUID(val);
}
@@ -232,7 +235,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
resolver.resolveAttributes(context);
// Now test that we got exactly what we expected - nothing
- Assert.assertNull(context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME));
+ assertNull(context.getResolvedIdPAttributes().get(ComputedIDDataConnectorTest.OUTPUT_ATTRIBUTE_NAME));
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index e983d09..0fb126f 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.dc.ldap.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -25,6 +31,18 @@ import java.util.Properties;
import javax.annotation.Nonnull;
+import org.ldaptive.ConnectionFactory;
+import org.ldaptive.DefaultConnectionFactory;
+import org.ldaptive.SearchExecutor;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.unboundid.ldap.listener.InMemoryDirectoryServer;
+import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
+import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldap.sdk.LDAPException;
+
import net.shibboleth.idp.attribute.EmptyAttributeValue;
import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -41,19 +59,6 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
-import org.ldaptive.ConnectionFactory;
-import org.ldaptive.DefaultConnectionFactory;
-import org.ldaptive.SearchExecutor;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.unboundid.ldap.listener.InMemoryDirectoryServer;
-import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
-import com.unboundid.ldap.listener.InMemoryListenerConfig;
-import com.unboundid.ldap.sdk.LDAPException;
-
/**
* Tests for {@link LDAPDataConnector}
*/
@@ -128,7 +133,7 @@ public class LDAPDataConnectorTest {
try {
connector.initialize();
- Assert.fail("No connection factory");
+ fail("No connection factory");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -136,7 +141,7 @@ public class LDAPDataConnectorTest {
connector.setConnectionFactory(new DefaultConnectionFactory("ldap://localhost:55555"));
try {
connector.initialize();
- Assert.fail("No search executor");
+ fail("No search executor");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -147,7 +152,7 @@ public class LDAPDataConnectorTest {
connector.setSearchExecutor(searchExecutor);
try {
connector.initialize();
- Assert.fail("No filter builder");
+ fail("No filter builder");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -157,7 +162,7 @@ public class LDAPDataConnectorTest {
connector.setExecutableSearchBuilder(requestBuilder);
try {
connector.initialize();
- Assert.fail("Invalid Connection Factory");
+ fail("Invalid Connection Factory");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -170,7 +175,7 @@ public class LDAPDataConnectorTest {
try {
connector.resolve(null);
- Assert.fail("Need to initialize first");
+ fail("Need to initialize first");
} catch (final UninitializedComponentException e) {
// OK
}
@@ -178,14 +183,14 @@ public class LDAPDataConnectorTest {
connector.initialize();
try {
connector.setConnectionFactory(null);
- Assert.fail("Setter after initialize");
+ fail("Setter after initialize");
} catch (final UnmodifiableComponentException e) {
// OK
}
- Assert.assertEquals(connector.getConnectionFactory(), connectionFactory);
- Assert.assertEquals(connector.getSearchExecutor(), searchExecutor);
- Assert.assertEquals(connector.getExecutableSearchBuilder(), requestBuilder);
- Assert.assertEquals(connector.getMappingStrategy(), mappingStrategy);
+ assertEquals(connector.getConnectionFactory(), connectionFactory);
+ assertEquals(connector.getSearchExecutor(), searchExecutor);
+ assertEquals(connector.getExecutableSearchBuilder(), requestBuilder);
+ assertEquals(connector.getMappingStrategy(), mappingStrategy);
}
@Test public void failFastInitialize() throws ComponentInitializationException {
@@ -199,7 +204,7 @@ public class LDAPDataConnectorTest {
try {
connector.initialize();
- Assert.fail("No failfast");
+ fail("No failfast");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -232,8 +237,8 @@ public class LDAPDataConnectorTest {
attributeValues.add(new StringAttributeValue("student"));
dependsAttributes.put("affiliation", attributeValues);
final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
- Assert.assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
- Assert.assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+ assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+ assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
}
@Test public void resolveWithMultiValueDepends() throws ComponentInitializationException, ResolutionException {
@@ -250,10 +255,10 @@ public class LDAPDataConnectorTest {
attributeValues.add(new StringAttributeValue("entitlement*"));
dependsAttributes.put("entitlement", attributeValues);
final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
- Assert.assertEquals(
+ assertEquals(
filter.getSearchFilter().format(),
"(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
- Assert.assertEquals(
+ assertEquals(
filter.getResultCacheKey(),
"(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
}
@@ -266,8 +271,8 @@ public class LDAPDataConnectorTest {
TestSources.createResolutionContext("domain\\user*", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final ExecutableSearchFilter filter = builder.build(context, null);
- Assert.assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
- Assert.assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
+ assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
+ assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
}
@Test public void resolveTemplate() throws ComponentInitializationException, ResolutionException {
@@ -305,8 +310,8 @@ public class LDAPDataConnectorTest {
attributeValues.add(new StringAttributeValue("student"));
dependsAttributes.put("affiliation", attributeValues);
final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
- Assert.assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
- Assert.assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+ assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+ assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
}
@Test public void resolveTemplateWithMultiValueDepends() throws ComponentInitializationException, ResolutionException {
@@ -324,10 +329,10 @@ public class LDAPDataConnectorTest {
attributeValues.add(new StringAttributeValue("entitlement*"));
dependsAttributes.put("entitlement", attributeValues);
final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
- Assert.assertEquals(
+ assertEquals(
filter.getSearchFilter().format(),
"(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
- Assert.assertEquals(
+ assertEquals(
filter.getResultCacheKey(),
"(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
}
@@ -341,8 +346,8 @@ public class LDAPDataConnectorTest {
TestSources.createResolutionContext("domain\\user*", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final ExecutableSearchFilter filter = builder.build(context, null);
- Assert.assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
- Assert.assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
+ assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
+ assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
}
protected void resolve(final ExecutableSearchBuilder builder) throws ComponentInitializationException,
@@ -354,25 +359,25 @@ public class LDAPDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final Map<String, IdPAttribute> attrs = connector.resolve(context);
- Assert.assertNotNull(attrs);
+ assertNotNull(attrs);
// check total attributes: uid, cn, sn, mail
- Assert.assertEquals(attrs.size(), 4);
+ assertEquals(attrs.size(), 4);
// check uid
- Assert.assertEquals(attrs.get("uid").getValues().size(), 1);
- Assert.assertEquals(new StringAttributeValue(TestSources.PRINCIPAL_ID), attrs.get("uid").getValues().iterator()
+ assertEquals(attrs.get("uid").getValues().size(), 1);
+ assertEquals(new StringAttributeValue(TestSources.PRINCIPAL_ID), attrs.get("uid").getValues().iterator()
.next());
// check cn
- Assert.assertEquals(attrs.get("cn").getValues().size(), 3);
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
+ assertEquals(attrs.get("cn").getValues().size(), 3);
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
// check sn
- Assert.assertEquals(attrs.get("sn").getValues().size(), 1);
- Assert.assertEquals(new StringAttributeValue("Principal"), attrs.get("sn").getValues().iterator().next());
+ assertEquals(attrs.get("sn").getValues().size(), 1);
+ assertEquals(new StringAttributeValue("Principal"), attrs.get("sn").getValues().iterator().next());
// check mail
- Assert.assertEquals(attrs.get("mail").getValues().size(), 2);
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
+ assertEquals(attrs.get("mail").getValues().size(), 2);
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
}
protected void resolveMulti(final ExecutableSearchBuilder builder) throws ComponentInitializationException,
@@ -384,34 +389,34 @@ public class LDAPDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final Map<String, IdPAttribute> attrs = connector.resolve(context);
- Assert.assertNotNull(attrs);
+ assertNotNull(attrs);
// check total attributes: uid, cn, sn, mail
- Assert.assertEquals(attrs.size(), 4);
+ assertEquals(attrs.size(), 4);
// check uid
- Assert.assertEquals(attrs.get("uid").getValues().size(), 3);
- Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
- Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PAUL_THE_PRINCIPAL")));
- Assert.assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PHILIP_THE_PRINCIPAL")));
+ assertEquals(attrs.get("uid").getValues().size(), 3);
+ assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue(TestSources.PRINCIPAL_ID)));
+ assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PAUL_THE_PRINCIPAL")));
+ assertTrue(attrs.get("uid").getValues().contains(new StringAttributeValue("PHILIP_THE_PRINCIPAL")));
// check cn
- Assert.assertEquals(attrs.get("cn").getValues().size(), 5);
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Paul Principal")));
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Philip Principal")));
+ assertEquals(attrs.get("cn").getValues().size(), 5);
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Paul Principal")));
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Philip Principal")));
// check sn
- Assert.assertEquals(attrs.get("sn").getValues().size(), 3);
- Assert.assertTrue(attrs.get("sn").getValues().contains(new StringAttributeValue("Principal")));
+ assertEquals(attrs.get("sn").getValues().size(), 3);
+ assertTrue(attrs.get("sn").getValues().contains(new StringAttributeValue("Principal")));
// check mail
- Assert.assertEquals(attrs.get("mail").getValues().size(), 8);
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paul.principal at shibboleth.net")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paulprincipal at shibboleth.net")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("\"\"")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" ")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" philip.principal at shibboleth.net ")));
+ assertEquals(attrs.get("mail").getValues().size(), 8);
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paul.principal at shibboleth.net")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("paulprincipal at shibboleth.net")));
+ assertTrue(attrs.get("mail").getValues().contains(EmptyAttributeValue.ZERO_LENGTH));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("\"\"")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" ")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" philip.principal at shibboleth.net ")));
}
@Test(expectedExceptions = ResolutionException.class) public void resolveNoFilter()
@@ -444,9 +449,9 @@ public class LDAPDataConnectorTest {
TestSources.SP_ENTITY_ID);
try {
final Map<String, IdPAttribute> res = connector.resolve(context);
- Assert.assertNotNull(res);
+ assertNotNull(res);
} catch (final ResolutionException e) {
- Assert.fail("Resolution exception occurred", e);
+ fail("Resolution exception occurred", e);
}
context =
@@ -467,9 +472,9 @@ public class LDAPDataConnectorTest {
TestSources.SP_ENTITY_ID);
try {
final Map<String, IdPAttribute> res = connector.resolve(context);
- Assert.assertNull(res);
+ assertNull(res);
} catch (final ResolutionException e) {
- Assert.fail("Resolution exception occurred", e);
+ fail("Resolution exception occurred", e);
}
context =
@@ -487,10 +492,10 @@ public class LDAPDataConnectorTest {
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- Assert.assertEquals(cache.size(), 0);
+ assertEquals(cache.size(), 0);
final Map<String, IdPAttribute> optional = connector.resolve(context);
- Assert.assertEquals(cache.size(), 1);
- Assert.assertEquals(cache.iterator().next(), optional);
+ assertEquals(cache.size(), 1);
+ assertEquals(cache.iterator().next(), optional);
}
/** See IDP-1077. */
@@ -500,18 +505,18 @@ public class LDAPDataConnectorTest {
connector.setResultsCache(cache);
connector.initialize();
- Assert.assertEquals(cache.size(), 0);
+ assertEquals(cache.size(), 0);
final AttributeResolutionContext context1 =
TestSources.createResolutionContext("dlo1", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
connector.resolve(context1);
- Assert.assertEquals(cache.size(), 1);
+ assertEquals(cache.size(), 1);
final AttributeResolutionContext context2 =
TestSources.createResolutionContext("dn11", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
connector.resolve(context2);
- Assert.assertEquals(cache.size(), 2);
+ assertEquals(cache.size(), 2);
}
/** See IDP-573. */
@@ -526,25 +531,25 @@ public class LDAPDataConnectorTest {
TestSources.createResolutionContext("PHILIP_THE_PRINCIPAL", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final Map<String, IdPAttribute> attrs = connector.resolve(context);
- Assert.assertNotNull(attrs);
+ assertNotNull(attrs);
// check total attributes: uid, cn, sn, mail
- Assert.assertEquals(attrs.size(), 4);
+ assertEquals(attrs.size(), 4);
// check uid
- Assert.assertEquals(attrs.get("uid").getValues().size(), 1);
- Assert.assertEquals(attrs.get("uid").getValues().iterator().next(), new StringAttributeValue(
+ assertEquals(attrs.get("uid").getValues().size(), 1);
+ assertEquals(attrs.get("uid").getValues().iterator().next(), new StringAttributeValue(
"PHILIP_THE_PRINCIPAL"));
// check cn
- Assert.assertEquals(attrs.get("cn").getValues().size(), 1);
- Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Philip Principal")));
+ assertEquals(attrs.get("cn").getValues().size(), 1);
+ assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Philip Principal")));
// check sn
- Assert.assertEquals(attrs.get("sn").getValues().size(), 1);
- Assert.assertEquals(attrs.get("sn").getValues().iterator().next(), new StringAttributeValue("Principal"));
+ assertEquals(attrs.get("sn").getValues().size(), 1);
+ assertEquals(attrs.get("sn").getValues().iterator().next(), new StringAttributeValue("Principal"));
// check mail
- Assert.assertEquals(attrs.get("mail").getValues().size(), 4);
- Assert.assertTrue(attrs.get("mail").getValues().contains(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE)));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("\"\"")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" ")));
- Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" philip.principal at shibboleth.net ")));
+ assertEquals(attrs.get("mail").getValues().size(), 4);
+ assertTrue(attrs.get("mail").getValues().contains(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE)));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("\"\"")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" ")));
+ assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" philip.principal at shibboleth.net ")));
}
public static ParameterizedExecutableSearchFilterBuilder newParameterizedExecutableSearchFilterBuilder(final String filter) throws ComponentInitializationException {
@@ -569,4 +574,4 @@ public class LDAPDataConnectorTest {
validator.initialize();
return validator;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
index e1eacfd..9bc3224 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
@@ -17,24 +17,15 @@
package net.shibboleth.idp.attribute.resolver.dc.ldap.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.List;
import java.util.Map;
-import net.shibboleth.idp.attribute.EmptyAttributeValue;
-import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.resolver.DataConnector;
-import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
-import net.shibboleth.idp.saml.impl.TestSources;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
-import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -44,6 +35,17 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
+import net.shibboleth.idp.attribute.EmptyAttributeValue;
+import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.resolver.DataConnector;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
+import net.shibboleth.idp.saml.impl.TestSources;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
*
*/
@@ -125,8 +127,8 @@ public class Regressions {
TestSources.SP_ENTITY_ID);
final Map<String, IdPAttribute> attrs = connector.resolve(context);
final List<IdPAttributeValue<?>> values = attrs.get("mail").getValues();
- Assert.assertEquals(values.size(), 4);
- Assert.assertTrue(values.contains(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE)));
+ assertEquals(values.size(), 4);
+ assertTrue(values.contains(new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE)));
}
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index 32935a4..afba0f6 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.dc.rdbms.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.sql.SQLException;
import java.time.Duration;
import java.util.ArrayList;
@@ -27,6 +33,10 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.sql.DataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.EmptyAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -42,11 +52,6 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
-import org.hsqldb.jdbc.JDBCDataSource;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link RDBMSDataConnector}
*/
@@ -120,7 +125,7 @@ public class RDBMSDataConnectorTest {
try {
connector.initialize();
- Assert.fail("No datasource");
+ fail("No datasource");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -128,7 +133,7 @@ public class RDBMSDataConnectorTest {
connector.setDataSource(new JDBCDataSource());
try {
connector.initialize();
- Assert.fail("No statement builder");
+ fail("No statement builder");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -137,7 +142,7 @@ public class RDBMSDataConnectorTest {
connector.setExecutableSearchBuilder(statementBuilder);
try {
connector.initialize();
- Assert.fail("Invalid datasource");
+ fail("Invalid datasource");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -149,7 +154,7 @@ public class RDBMSDataConnectorTest {
try {
connector.resolve(null);
- Assert.fail("Need to initialize first");
+ fail("Need to initialize first");
} catch (final UninitializedComponentException e) {
// OK
}
@@ -157,13 +162,13 @@ public class RDBMSDataConnectorTest {
connector.initialize();
try {
connector.setDataSource(null);
- Assert.fail("Setter after initialize");
+ fail("Setter after initialize");
} catch (final UnmodifiableComponentException e) {
// OK
}
- Assert.assertEquals(connector.getDataSource(), datasource);
- Assert.assertEquals(connector.getExecutableSearchBuilder(), statementBuilder);
- Assert.assertEquals(connector.getMappingStrategy(), mappingStrategy);
+ assertEquals(connector.getDataSource(), datasource);
+ assertEquals(connector.getExecutableSearchBuilder(), statementBuilder);
+ assertEquals(connector.getMappingStrategy(), mappingStrategy);
}
@Test public void failFastInitialize() throws ComponentInitializationException {
@@ -175,7 +180,7 @@ public class RDBMSDataConnectorTest {
try {
connector.initialize();
- Assert.fail("No failfast");
+ fail("No failfast");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -201,7 +206,7 @@ public class RDBMSDataConnectorTest {
attributeValues.add(new StringAttributeValue("student"));
dependsAttributes.put("affiliation", attributeValues);
final String query = builder.getSQLQuery(context, dependsAttributes);
- Assert.assertEquals(query, "SELECT userid FROM people WHERE userid='PETER_THE_PRINCIPAL' AND affiliation='student'");
+ assertEquals(query, "SELECT userid FROM people WHERE userid='PETER_THE_PRINCIPAL' AND affiliation='student'");
}
@Test public void resolveTemplateWithMultiValueDepends() throws ComponentInitializationException, ResolutionException {
@@ -218,7 +223,7 @@ public class RDBMSDataConnectorTest {
attributeValues.add(new StringAttributeValue("entitlement2"));
dependsAttributes.put("entitlement", attributeValues);
final String query = builder.getSQLQuery(context, dependsAttributes);
- Assert.assertEquals(query, "SELECT userid FROM people WHERE userid='PETER_THE_PRINCIPAL' AND eduPersonEntitlement='entitlement1' AND eduPersonEntitlement='entitlement2'");
+ assertEquals(query, "SELECT userid FROM people WHERE userid='PETER_THE_PRINCIPAL' AND eduPersonEntitlement='entitlement1' AND eduPersonEntitlement='entitlement2'");
}
@Test public void escapeTemplate() throws ComponentInitializationException, ResolutionException {
@@ -230,7 +235,7 @@ public class RDBMSDataConnectorTest {
TestSources.createResolutionContext("McHale's Navy", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final String query = builder.getSQLQuery(context, null);
- Assert.assertEquals(query, "SELECT userid FROM people WHERE userid='McHale''s Navy'");
+ assertEquals(query, "SELECT userid FROM people WHERE userid='McHale''s Navy'");
}
@Test public void resolve() throws ComponentInitializationException, ResolutionException {
@@ -243,22 +248,22 @@ public class RDBMSDataConnectorTest {
final Map<String, IdPAttribute> attrs = connector.resolve(context);
// check total attributes: userid, name, homephone, mail
- Assert.assertTrue(attrs.size() == 4);
+ assertTrue(attrs.size() == 4);
// check userid
- Assert.assertTrue(attrs.get("USERID").getValues().size() == 1);
- Assert.assertEquals(new StringAttributeValue(TestSources.PRINCIPAL_ID), attrs.get("USERID").getValues()
+ assertTrue(attrs.get("USERID").getValues().size() == 1);
+ assertEquals(new StringAttributeValue(TestSources.PRINCIPAL_ID), attrs.get("USERID").getValues()
.iterator().next());
// check name
- Assert.assertTrue(attrs.get("NAME").getValues().size() == 1);
- Assert.assertEquals(new StringAttributeValue("Peter Principal"), attrs.get("NAME").getValues().iterator()
+ assertTrue(attrs.get("NAME").getValues().size() == 1);
+ assertEquals(new StringAttributeValue("Peter Principal"), attrs.get("NAME").getValues().iterator()
.next());
// check homephone
- Assert.assertTrue(attrs.get("HOMEPHONE").getValues().size() == 1);
- Assert.assertEquals(new StringAttributeValue("555-111-2222"), attrs.get("HOMEPHONE").getValues().iterator()
+ assertTrue(attrs.get("HOMEPHONE").getValues().size() == 1);
+ assertEquals(new StringAttributeValue("555-111-2222"), attrs.get("HOMEPHONE").getValues().iterator()
.next());
// check mail
- Assert.assertTrue(attrs.get("MAIL").getValues().size() == 1);
- Assert.assertEquals(new StringAttributeValue("peter.principal at shibboleth.net"), attrs.get("MAIL").getValues()
+ assertTrue(attrs.get("MAIL").getValues().size() == 1);
+ assertEquals(new StringAttributeValue("peter.principal at shibboleth.net"), attrs.get("MAIL").getValues()
.iterator().next());
}
@@ -291,9 +296,9 @@ public class RDBMSDataConnectorTest {
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
try {
- Assert.assertNotNull(connector.resolve(context));
+ assertNotNull(connector.resolve(context));
} catch (final ResolutionException e) {
- Assert.fail("Resolution exception occurred", e);
+ fail("Resolution exception occurred", e);
}
context =
@@ -313,9 +318,9 @@ public class RDBMSDataConnectorTest {
TestSources.createResolutionContext("NOT_A_PRINCIPAL", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
try {
- Assert.assertNull(connector.resolve(context));
+ assertNull(connector.resolve(context));
} catch (final ResolutionException e) {
- Assert.fail("Resolution exception occurred", e);
+ fail("Resolution exception occurred", e);
}
context =
@@ -333,10 +338,10 @@ public class RDBMSDataConnectorTest {
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- Assert.assertTrue(cache.size() == 0);
+ assertTrue(cache.size() == 0);
final Map<String, IdPAttribute> optional = connector.resolve(context);
- Assert.assertTrue(cache.size() == 1);
- Assert.assertEquals(cache.iterator().next(), optional);
+ assertTrue(cache.size() == 1);
+ assertEquals(cache.iterator().next(), optional);
}
@Test public void resolveMultiple() throws ComponentInitializationException, ResolutionException {
@@ -349,11 +354,11 @@ public class RDBMSDataConnectorTest {
final Map<String, IdPAttribute> attrs = connector.resolve(context);
// check total attributes: name
- Assert.assertTrue(attrs.size() == 1);
+ assertTrue(attrs.size() == 1);
// check name
- Assert.assertTrue(attrs.get("NAME").getValues().size() == 2);
- Assert.assertTrue(attrs.get("NAME").getValues().contains(new StringAttributeValue("group1")));
- Assert.assertTrue(attrs.get("NAME").getValues().contains(new StringAttributeValue("group2")));
+ assertTrue(attrs.get("NAME").getValues().size() == 2);
+ assertTrue(attrs.get("NAME").getValues().contains(new StringAttributeValue("group1")));
+ assertTrue(attrs.get("NAME").getValues().contains(new StringAttributeValue("group2")));
}
/** See IDP-573. */
@@ -367,25 +372,25 @@ public class RDBMSDataConnectorTest {
final Map<String, IdPAttribute> attrs = connector.resolve(context);
// check total attributes: userid, name, homephone, mail
- Assert.assertTrue(attrs.size() == 4);
+ assertTrue(attrs.size() == 4);
// check userid
- Assert.assertTrue(attrs.get("USERID").getValues().size() == 4);
- Assert.assertEquals(attrs.get("USERID").getValues().iterator().next(), new StringAttributeValue(
+ assertTrue(attrs.get("USERID").getValues().size() == 4);
+ assertEquals(attrs.get("USERID").getValues().iterator().next(), new StringAttributeValue(
"PHILIP_THE_PRINCIPAL"));
// check name
- Assert.assertTrue(attrs.get("NAME").getValues().size() == 4);
- Assert.assertEquals(attrs.get("NAME").getValues().iterator().next(), new StringAttributeValue(
+ assertTrue(attrs.get("NAME").getValues().size() == 4);
+ assertEquals(attrs.get("NAME").getValues().iterator().next(), new StringAttributeValue(
"Philip Principal"));
// check homephone
- Assert.assertTrue(attrs.get("HOMEPHONE").getValues().size() == 4);
- Assert.assertEquals(attrs.get("HOMEPHONE").getValues().iterator().next(), new StringAttributeValue(
+ assertTrue(attrs.get("HOMEPHONE").getValues().size() == 4);
+ assertEquals(attrs.get("HOMEPHONE").getValues().iterator().next(), new StringAttributeValue(
"555-111-4444"));
// check mail
- Assert.assertTrue(attrs.get("MAIL").getValues().size() == 4);
- Assert.assertTrue(attrs.get("MAIL").getValues().contains(EmptyAttributeValue.NULL));
- Assert.assertTrue(attrs.get("MAIL").getValues().contains(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertTrue(attrs.get("MAIL").getValues().contains(new StringAttributeValue(" ")));
- Assert.assertTrue(attrs.get("MAIL").getValues().contains(new StringAttributeValue(" phil.principal at shibboleth.net ")));
+ assertTrue(attrs.get("MAIL").getValues().size() == 4);
+ assertTrue(attrs.get("MAIL").getValues().contains(EmptyAttributeValue.NULL));
+ assertTrue(attrs.get("MAIL").getValues().contains(EmptyAttributeValue.ZERO_LENGTH));
+ assertTrue(attrs.get("MAIL").getValues().contains(new StringAttributeValue(" ")));
+ assertTrue(attrs.get("MAIL").getValues().contains(new StringAttributeValue(" phil.principal at shibboleth.net ")));
}
static protected FormatExecutableStatementBuilder newFormatExecutableStatementBuilder(@Nonnull final String query) {
@@ -400,4 +405,4 @@ public class RDBMSDataConnectorTest {
builder.setQueryTimeout(timeout);
return builder;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
index 165f5cf..917c3b3 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
@@ -17,20 +17,25 @@
package net.shibboleth.idp.attribute.resolver.impl;
+import static org.testng.Assert.assertEquals;
+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.HashSet;
import java.util.function.Function;
+import org.opensaml.messaging.context.navigate.ParentContextLookup;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.navigate.AttributeIssuerIdLookupFunction;
import net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction;
import net.shibboleth.idp.attribute.resolver.context.navigate.AttributeRecipientIdLookupFunction;
-import org.opensaml.messaging.context.navigate.ParentContextLookup;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** Unit test for {@link AttributeResolutionContext}. */
public class AttributeResolutionContextTest {
@@ -43,9 +48,9 @@ public class AttributeResolutionContextTest {
@Test public void instantiation() {
AttributeResolutionContext context = new AttributeResolutionContext();
- Assert.assertNull(context.getParent());
- Assert.assertNotNull(context.getRequestedIdPAttributeNames());
- Assert.assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
+ assertNull(context.getParent());
+ assertNotNull(context.getRequestedIdPAttributeNames());
+ assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
}
/** Test {@link AttributeResolutionContext#setRequestedIdPAttributeNames(java.util.Collection)}. */
@@ -54,26 +59,26 @@ public class AttributeResolutionContextTest {
HashSet<String> attributes = new HashSet<>();
context.setRequestedIdPAttributeNames(attributes);
- Assert.assertNotNull(context.getRequestedIdPAttributeNames());
- Assert.assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
+ assertNotNull(context.getRequestedIdPAttributeNames());
+ assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
attributes.add(null);
context.setRequestedIdPAttributeNames(attributes);
- Assert.assertNotNull(context.getRequestedIdPAttributeNames());
- Assert.assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
+ assertNotNull(context.getRequestedIdPAttributeNames());
+ assertTrue(context.getRequestedIdPAttributeNames().isEmpty());
attributes.add("foo");
attributes.add(null);
attributes.add("bar");
context.setRequestedIdPAttributeNames(attributes);
- Assert.assertNotNull(context.getRequestedIdPAttributeNames());
- Assert.assertEquals(context.getRequestedIdPAttributeNames().size(), 2);
+ assertNotNull(context.getRequestedIdPAttributeNames());
+ assertEquals(context.getRequestedIdPAttributeNames().size(), 2);
attributes.clear();
attributes.add("baz");
context.setRequestedIdPAttributeNames(attributes);
- Assert.assertNotNull(context.getRequestedIdPAttributeNames());
- Assert.assertEquals(context.getRequestedIdPAttributeNames().size(), 1);
+ assertNotNull(context.getRequestedIdPAttributeNames());
+ assertEquals(context.getRequestedIdPAttributeNames().size(), 1);
}
/** Test {@link AttributeResolutionContext#setRequestedIdPAttributeNames(java.util.Collection)}. */
@@ -81,31 +86,31 @@ public class AttributeResolutionContextTest {
AttributeResolutionContext context = new AttributeResolutionContext();
context.setResolvedIdPAttributes(null);
- Assert.assertNotNull(context.getResolvedIdPAttributes());
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertNotNull(context.getResolvedIdPAttributes());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
HashSet<IdPAttribute> attributes = new HashSet<>();
context.setResolvedIdPAttributes(attributes);
- Assert.assertNotNull(context.getResolvedIdPAttributes());
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertNotNull(context.getResolvedIdPAttributes());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
attributes.add(null);
context.setResolvedIdPAttributes(attributes);
- Assert.assertNotNull(context.getResolvedIdPAttributes());
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertNotNull(context.getResolvedIdPAttributes());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
attributes.add(new IdPAttribute("foo"));
attributes.add(null);
attributes.add(new IdPAttribute("bar"));
context.setResolvedIdPAttributes(attributes);
- Assert.assertNotNull(context.getResolvedIdPAttributes());
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 2);
+ assertNotNull(context.getResolvedIdPAttributes());
+ assertEquals(context.getResolvedIdPAttributes().size(), 2);
attributes.clear();
attributes.add(new IdPAttribute("baz"));
context.setResolvedIdPAttributes(attributes);
- Assert.assertNotNull(context.getResolvedIdPAttributes());
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertNotNull(context.getResolvedIdPAttributes());
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
}
@Test public void lookupsParent() {
@@ -116,17 +121,17 @@ public class AttributeResolutionContextTest {
context.setAttributeIssuerID(THE_ISSUER);
context.setAttributeRecipientID(THE_RECIPIENT);
- Assert.assertSame(context.getPrincipal(), THE_PRINCIPAL);
- Assert.assertSame(context.getAttributeIssuerID(), THE_ISSUER);
- Assert.assertSame(context.getAttributeRecipientID(), THE_RECIPIENT);
+ assertSame(context.getPrincipal(), THE_PRINCIPAL);
+ assertSame(context.getAttributeIssuerID(), THE_ISSUER);
+ assertSame(context.getAttributeRecipientID(), THE_RECIPIENT);
final Function<ProfileRequestContext,String> principalFn = new AttributePrincipalLookupFunction();
final Function<ProfileRequestContext,String> recipientFn = new AttributeRecipientIdLookupFunction();
final Function<ProfileRequestContext,String> issuerFn = new AttributeIssuerIdLookupFunction();
- Assert.assertSame(principalFn.apply(profileCtx), THE_PRINCIPAL);
- Assert.assertSame(issuerFn.apply(profileCtx), THE_ISSUER);
- Assert.assertSame(recipientFn.apply(profileCtx), THE_RECIPIENT);
+ assertSame(principalFn.apply(profileCtx), THE_PRINCIPAL);
+ assertSame(issuerFn.apply(profileCtx), THE_ISSUER);
+ assertSame(recipientFn.apply(profileCtx), THE_RECIPIENT);
}
@Test public void lookupsChild() {
@@ -141,18 +146,18 @@ public class AttributeResolutionContextTest {
final AttributeRecipientIdLookupFunction recipientFn = new AttributeRecipientIdLookupFunction();
final AttributeIssuerIdLookupFunction issuerFn = new AttributeIssuerIdLookupFunction();
- Assert.assertNull(principalFn.apply(profileCtx), THE_PRINCIPAL);
- Assert.assertNull(issuerFn.apply(profileCtx), THE_ISSUER);
- Assert.assertNull(recipientFn.apply(profileCtx), THE_RECIPIENT);
+ assertNull(principalFn.apply(profileCtx), THE_PRINCIPAL);
+ assertNull(issuerFn.apply(profileCtx), THE_ISSUER);
+ assertNull(recipientFn.apply(profileCtx), THE_RECIPIENT);
principalFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
recipientFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
issuerFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
- Assert.assertSame(principalFn.apply(profileCtx), THE_PRINCIPAL);
- Assert.assertSame(issuerFn.apply(profileCtx), THE_ISSUER);
- Assert.assertSame(recipientFn.apply(profileCtx), THE_RECIPIENT);
+ assertSame(principalFn.apply(profileCtx), THE_PRINCIPAL);
+ assertSame(issuerFn.apply(profileCtx), THE_ISSUER);
+ assertSame(recipientFn.apply(profileCtx), THE_RECIPIENT);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 3d5301a..862f457 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,7 +37,6 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -70,34 +75,34 @@ public class AttributeResolverImplTest {
newAttributeResolverImpl("toto", Collections.singleton((AttributeDefinition) attrDef),
Collections.singleton((DataConnector) dataCon));
- Assert.assertFalse(attrDef.isInitialized());
- Assert.assertFalse(attrDef.isDestroyed());
- Assert.assertFalse(dataCon.isDestroyed());
+ assertFalse(attrDef.isInitialized());
+ assertFalse(attrDef.isDestroyed());
+ assertFalse(dataCon.isDestroyed());
attrDef.initialize();
resolver.initialize();
- Assert.assertTrue(attrDef.isInitialized());
- Assert.assertFalse(attrDef.isDestroyed());
- Assert.assertTrue(dataCon.isInitialized());
- Assert.assertFalse(dataCon.isDestroyed());
+ assertTrue(attrDef.isInitialized());
+ assertFalse(attrDef.isDestroyed());
+ assertTrue(dataCon.isInitialized());
+ assertFalse(dataCon.isDestroyed());
- Assert.assertEquals(resolver.getId(), "toto");
- Assert.assertEquals(resolver.getAttributeDefinitions().size(), 1);
- Assert.assertTrue(resolver.getAttributeDefinitions().containsKey("foo"));
- Assert.assertEquals(resolver.getDataConnectors().size(), 1);
- Assert.assertTrue(resolver.getDataConnectors().containsKey("bar"));
+ assertEquals(resolver.getId(), "toto");
+ assertEquals(resolver.getAttributeDefinitions().size(), 1);
+ assertTrue(resolver.getAttributeDefinitions().containsKey("foo"));
+ assertEquals(resolver.getDataConnectors().size(), 1);
+ assertTrue(resolver.getDataConnectors().containsKey("bar"));
attrDef.destroy();
resolver.destroy();
dataCon.destroy();
- Assert.assertTrue(attrDef.isInitialized());
- Assert.assertTrue(attrDef.isDestroyed());
- Assert.assertTrue(dataCon.isInitialized());
- Assert.assertTrue(dataCon.isDestroyed());
+ assertTrue(attrDef.isInitialized());
+ assertTrue(attrDef.isDestroyed());
+ assertTrue(dataCon.isInitialized());
+ assertTrue(dataCon.isDestroyed());
try {
resolver.initialize();
- Assert.fail();
+ fail();
} catch (final DestroyedComponentException e) {
// OK
}
@@ -113,13 +118,13 @@ public class AttributeResolverImplTest {
final AttributeResolverImpl resolver = newAttributeResolverImpl(" foo ", definitions, null);
resolver.initialize();
- Assert.assertNotNull(resolver.getAttributeDefinitions());
- Assert.assertEquals(resolver.getAttributeDefinitions().size(), 2);
+ assertNotNull(resolver.getAttributeDefinitions());
+ assertEquals(resolver.getAttributeDefinitions().size(), 2);
definitions.add(new MockAttributeDefinition("foo", new IdPAttribute("test")));
try {
newAttributeResolverImpl(" foo ", definitions, null);
- Assert.fail();
+ fail();
} catch (final IllegalArgumentException e) {
// OK
}
@@ -133,13 +138,13 @@ public class AttributeResolverImplTest {
connectors.add(new MockDataConnector("bar", (Map) null));
final AttributeResolver resolver = newAttributeResolverImpl("foo", null, connectors);
- Assert.assertNotNull(resolver.getDataConnectors());
- Assert.assertEquals(resolver.getDataConnectors().size(), 2);
+ assertNotNull(resolver.getDataConnectors());
+ assertEquals(resolver.getDataConnectors().size(), 2);
connectors.add(new MockDataConnector("foo", (Map) null));
try {
newAttributeResolverImpl(" foo ", null, connectors);
- Assert.fail();
+ fail();
} catch (final IllegalArgumentException e) {
// OK
}
@@ -160,8 +165,8 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("ad1"), attribute);
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().get("ad1"), attribute);
}
/** Test that a simple resolve returns the expected results. */
@@ -180,14 +185,14 @@ public class AttributeResolverImplTest {
context.setRequestedIdPAttributeNames(Collections.singleton("ad1"));
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("ad1"), attribute);
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().get("ad1"), attribute);
context = new AttributeResolutionContext();
context.setRequestedIdPAttributeNames(Collections.singleton("1da"));
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
/** Test that a simple resolve returns the expected results. */
@@ -208,7 +213,7 @@ public class AttributeResolverImplTest {
AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail();
+ fail();
} catch (final ResolutionException e) {
// OK
}
@@ -225,7 +230,7 @@ public class AttributeResolverImplTest {
context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
log.debug("Logged Resolve fails");
}
@@ -239,7 +244,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
/** Test that resolve w/ dependencies returns the expected results. */
@@ -280,8 +285,8 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("test").getValues().size(), 2);
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().get("test").getValues().size(), 2);
}
/**
@@ -354,25 +359,25 @@ public class AttributeResolverImplTest {
AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 1);
dc1.setFailure(true);
context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 2);
+ assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 2);
dc1.setFailure(false);
context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 2);
+ assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 2);
Thread.sleep(6200);
context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().get("output").getValues().size(), 1);
}
/**
@@ -404,7 +409,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
try {
resolver.resolveAttributes(context);
- Assert.fail();
+ fail();
} catch (final ResolutionException e) {
//
// OK
@@ -441,7 +446,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 2);
+ assertEquals(context.getResolvedIdPAttributes().size(), 2);
final MockDataConnector dcfail1 = new MockDataConnector("failer1", new HashMap<String, IdPAttribute>());
dcfail1.setFailure(true);
@@ -507,7 +512,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
}
@Test public void dataConnectorWithDataDependency() throws ComponentInitializationException, ResolutionException {
@@ -538,7 +543,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertEquals(context.getResolvedIdPAttributes().size(), 1);
+ assertEquals(context.getResolvedIdPAttributes().size(), 1);
}
/**
@@ -556,7 +561,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
/**
@@ -580,7 +585,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
/** Test that after resolution that the values for a resolved attribute are deduped. */
@@ -600,8 +605,8 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().containsKey("ad1"));
- Assert.assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(), 1);
+ assertTrue(context.getResolvedIdPAttributes().containsKey("ad1"));
+ assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(), 1);
}
/** Test that after resolution that the values for a resolved attribute are deduped. */
@@ -621,8 +626,8 @@ public class AttributeResolverImplTest {
AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().containsKey("ad1"));
- Assert.assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(),2);
+ assertTrue(context.getResolvedIdPAttributes().containsKey("ad1"));
+ assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(),2);
resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.setStripNulls(true);
@@ -631,7 +636,7 @@ public class AttributeResolverImplTest {
context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
@@ -655,7 +660,7 @@ public class AttributeResolverImplTest {
final AttributeResolutionContext context = new AttributeResolutionContext();
resolver.resolveAttributes(context);
- Assert.assertTrue(context.getResolvedIdPAttributes().isEmpty());
+ assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
/** Test that validation fails when a plugin depends on a non-existent plugin. */
@@ -677,7 +682,7 @@ public class AttributeResolverImplTest {
AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -693,7 +698,7 @@ public class AttributeResolverImplTest {
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -718,7 +723,7 @@ public class AttributeResolverImplTest {
AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -734,7 +739,7 @@ public class AttributeResolverImplTest {
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -752,7 +757,7 @@ public class AttributeResolverImplTest {
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization.");
+ fail("invalid resolver configuration didn't fail initialization.");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -782,7 +787,7 @@ public class AttributeResolverImplTest {
resolver = newAttributeResolverImpl("foo", definitions, connectors);
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -801,7 +806,7 @@ public class AttributeResolverImplTest {
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization.");
+ fail("invalid resolver configuration didn't fail initialization.");
} catch (final ComponentInitializationException e) {
// OK
}
@@ -832,7 +837,7 @@ public class AttributeResolverImplTest {
resolver = newAttributeResolverImpl("foo", definitions, connectors);
try {
resolver.initialize();
- Assert.fail("invalid resolver configuration didn't fail initialization");
+ fail("invalid resolver configuration didn't fail initialization");
} catch (final ComponentInitializationException e) {
// expected this
}
@@ -847,4 +852,4 @@ public class AttributeResolverImplTest {
result.setDataConnectors(connectors);
return result;
}
-}
\ 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