[java-identity-provider] 04/10: idp-attribute-resolver-spring: Use static imports for all the asserts in the tests
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 11 08:59:56 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=aebf3f9d6eecff0db385a56a7920659cfd93f047
commit aebf3f9d6eecff0db385a56a7920659cfd93f047
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 10 17:23:31 2019 +0100
idp-attribute-resolver-spring: Use static imports for all the asserts in the tests
---
.../resolver/spring/AttributeMapperTest.java | 77 ++++++-------
.../spring/AttributeMappingNodeProcessorTest.java | 62 ++++++-----
.../resolver/spring/AttributeResolverTest.java | 121 +++++++++++----------
.../spring/BaseAttributeDefinitionParserTest.java | 19 ++--
.../resolver/spring/DependencyTypesTest.java | 35 +++---
...ntextDerivedAttributeDefinitionsParserTest.java | 30 ++---
.../ad/PrescopedAttributeDefinitionParserTest.java | 17 +--
...PrincipalNameAttributeDefinitionParserTest.java | 7 +-
.../RegexSplitAttributeDefinitionParserTest.java | 28 +++--
...ameIdentifierAttributeDefinitionParserTest.java | 18 +--
...meIDdentifierAttributeDefinitionParserTest.java | 20 ++--
.../ad/ScopedAttributeDefinitionParserTest.java | 9 +-
.../spring/ad/ScriptedAttributeParserTest.java | 43 ++++----
.../spring/ad/SimpleAttributeParserTest.java | 83 +++++++-------
.../ad/TemplateAttributeDefinitionParserTest.java | 31 +++---
.../MappedAttributeDefinitionParserTest.java | 33 +++---
.../spring/ad/mapped/SourceValueParserTest.java | 31 +++---
.../spring/ad/mapped/ValueMapParserTest.java | 20 ++--
.../dc/ComputedIdDataConnectorParserTest.java | 44 ++++----
.../spring/dc/ScriptDataConnectorParserTest.java | 30 ++---
.../spring/dc/StaticDataConnectorParserTest.java | 40 +++----
.../spring/dc/StoredIdDataConnectorParserTest.java | 28 ++---
.../dc/http/HTTPDataConnectorParserTest.java | 95 ++++++++--------
.../dc/ldap/LDAPDataConnectorParserTest.java | 8 +-
.../dc/rdbms/RDBMSDataConnectorParserTest.java | 60 +++++-----
.../attribute/resolver/spring/enc/Regressions.java | 13 ++-
.../enc/SAML1Base64AttributeEncoderParserTest.java | 19 ++--
...AML1ScopedStringAttributeEncoderParserTest.java | 31 +++---
.../enc/SAML1StringAttributeEncoderParserTest.java | 19 ++--
.../SAML1XMLObjectAttributeEncoderParserTest.java | 19 ++--
.../enc/SAML2Base64AttributeEncoderParserTest.java | 24 ++--
...AML2ScopedStringAttributeEncoderParserTest.java | 36 +++---
.../enc/SAML2StringAttributeEncoderParserTest.java | 41 ++++---
.../SAML2XMLObjectAttributeEncoderParserTest.java | 24 ++--
34 files changed, 649 insertions(+), 566 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
index a324189..da44ed6 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
@@ -17,10 +17,22 @@
package net.shibboleth.idp.attribute.resolver.spring;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.opensaml.saml.saml2.core.Attribute;
+import org.opensaml.saml.saml2.metadata.RequestedAttribute;
+import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.IdPRequestedAttribute;
@@ -37,15 +49,6 @@ import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.opensaml.saml.saml2.metadata.RequestedAttribute;
-import org.springframework.context.support.ConversionServiceFactoryBean;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-
/** test the Auto generation of the attribute mapper */
public class AttributeMapperTest extends OpenSAMLInitBaseTestCase {
@@ -100,45 +103,45 @@ public class AttributeMapperTest extends OpenSAMLInitBaseTestCase {
}
Collection<AttributeMapper<RequestedAttribute, IdPRequestedAttribute>> mappers = attributesMapper.getMappers();
- Assert.assertEquals(mappers.size(), 5);
+ assertEquals(mappers.size(), 5);
for (AttributeMapper<RequestedAttribute, IdPRequestedAttribute> mapper : mappers) {
AbstractSAMLAttributeMapper sMappers = (AbstractSAMLAttributeMapper) mapper;
if (mapper.getId().equals("MapperForfeduPersonScopedAffiliation")) {
- Assert.assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.9");
- Assert.assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
- Assert.assertEquals(sMappers.getAttributeIds().size(), 1);
- Assert.assertEquals(sMappers.getAttributeIds().get(0), "eduPersonScopedAffiliation");
+ assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.9");
+ assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
+ assertEquals(sMappers.getAttributeIds().size(), 1);
+ assertEquals(sMappers.getAttributeIds().get(0), "eduPersonScopedAffiliation");
ScopedStringAttributeValueMapper valueMapper =
(ScopedStringAttributeValueMapper) sMappers.getValueMapper();
- Assert.assertEquals(valueMapper.getDelimiter(), "#");
+ assertEquals(valueMapper.getDelimiter(), "#");
} else if (mapper.getId().equals("MapperForfeduPersonAssurance")) {
- Assert.assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.11");
- Assert.assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
- Assert.assertEquals(sMappers.getAttributeIds().size(), 2);
- Assert.assertEquals(sMappers.getAttributeIds().get(0), "eduPersonAssurance");
- Assert.assertEquals(sMappers.getAttributeIds().get(1), "otherPersonAssurance");
- Assert.assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
+ assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.11");
+ assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
+ assertEquals(sMappers.getAttributeIds().size(), 2);
+ assertEquals(sMappers.getAttributeIds().get(0), "eduPersonAssurance");
+ assertEquals(sMappers.getAttributeIds().get(1), "otherPersonAssurance");
+ assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
} else if (mapper.getId().equals("MapperForfOeduPersonAssurance")) {
- Assert.assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.11");
- Assert.assertEquals(sMappers.getAttributeFormat(), "http://example.org/Format");
- Assert.assertEquals(sMappers.getAttributeIds().size(), 1);
- Assert.assertEquals(sMappers.getAttributeIds().get(0), "otherFormatPersonAssurance");
- Assert.assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
+ assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.11");
+ assertEquals(sMappers.getAttributeFormat(), "http://example.org/Format");
+ assertEquals(sMappers.getAttributeIds().size(), 1);
+ assertEquals(sMappers.getAttributeIds().get(0), "otherFormatPersonAssurance");
+ assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
} else if (mapper.getId().equals("MapperForfotherSAMLName")) {
- Assert.assertEquals(sMappers.getSAMLName(), "http://example.org/name/for/Attribute");
- Assert.assertEquals(sMappers.getAttributeFormat(), "http://example.org/Format");
- Assert.assertEquals(sMappers.getAttributeIds().size(), 1);
- Assert.assertEquals(sMappers.getAttributeIds().get(0), "eduPersonAssurance");
- Assert.assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
+ assertEquals(sMappers.getSAMLName(), "http://example.org/name/for/Attribute");
+ assertEquals(sMappers.getAttributeFormat(), "http://example.org/Format");
+ assertEquals(sMappers.getAttributeIds().size(), 1);
+ assertEquals(sMappers.getAttributeIds().get(0), "eduPersonAssurance");
+ assertTrue(sMappers.getValueMapper() instanceof StringAttributeValueMapper);
} else if (mapper.getId().equals("MapperForfeduPersonTargetedID")) {
- Assert.assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.10");
- Assert.assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
- Assert.assertEquals(sMappers.getAttributeIds().size(), 1);
- Assert.assertEquals(sMappers.getAttributeIds().get(0), "eduPersonTID");
- Assert.assertTrue(sMappers.getValueMapper() instanceof XMLObjectAttributeValueMapper);
+ assertEquals(sMappers.getSAMLName(), "urn:oid:1.3.6.1.4.1.5923.1.1.1.10");
+ assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
+ assertEquals(sMappers.getAttributeIds().size(), 1);
+ assertEquals(sMappers.getAttributeIds().get(0), "eduPersonTID");
+ assertTrue(sMappers.getValueMapper() instanceof XMLObjectAttributeValueMapper);
} else {
- Assert.fail();
+ fail();
}
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
index 3eb3e3e..6fd00ff 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
@@ -17,33 +17,37 @@
package net.shibboleth.idp.attribute.resolver.spring;
+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 java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-import net.shibboleth.ext.spring.config.StringToDurationConverter;
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPRequestedAttribute;
-import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.resolver.AttributeResolver;
-import net.shibboleth.idp.saml.attribute.mapping.AttributesMapContainer;
-import net.shibboleth.idp.saml.metadata.impl.AttributeMappingNodeProcessor;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-
import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.metadata.resolver.filter.FilterException;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.google.common.collect.Multimap;
+import net.shibboleth.ext.spring.config.StringToDurationConverter;
+import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPRequestedAttribute;
+import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.resolver.AttributeResolver;
+import net.shibboleth.idp.saml.attribute.mapping.AttributesMapContainer;
+import net.shibboleth.idp.saml.metadata.impl.AttributeMappingNodeProcessor;
+import net.shibboleth.utilities.java.support.service.ReloadableService;
+
/**
* Test for {@link AttributeMappingNodeProcessor}.
*/
@@ -72,9 +76,9 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
@BeforeClass public void setup() {
entityDescriptor = unmarshallElement("/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml");
- Assert.assertNotNull(entityDescriptor);
+ assertNotNull(entityDescriptor);
service = getService();
- Assert.assertNotNull(service);
+ assertNotNull(service);
processor = new AttributeMappingNodeProcessor(service);
}
@@ -102,7 +106,7 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
@Test public void entityAttributes() throws FilterException {
- Assert.assertTrue(entityDescriptor.getObjectMetadata().get(AttributesMapContainer.class).isEmpty());
+ assertTrue(entityDescriptor.getObjectMetadata().get(AttributesMapContainer.class).isEmpty());
processor.process(entityDescriptor);
@@ -111,15 +115,15 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
final Multimap<String, IdPAttribute> map = container.get();
- Assert.assertEquals(map.size(), 1);
+ assertEquals(map.size(), 1);
Collection<IdPAttribute> attribute = map.get("dn1");
- Assert.assertEquals(attribute.size(), 1);
+ assertEquals(attribute.size(), 1);
IdPAttribute attr = attribute.iterator().next();
- Assert.assertEquals(attr.getValues().size(), 1);
+ assertEquals(attr.getValues().size(), 1);
StringAttributeValue sav = (StringAttributeValue) attr.getValues().iterator().next();
- Assert.assertEquals(sav.getValue(), "http://id.incommon.org/category/research-and-scholarship");
+ assertEquals(sav.getValue(), "http://id.incommon.org/category/research-and-scholarship");
}
@Test public void requiredAttributes() throws FilterException {
@@ -128,7 +132,7 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
entityDescriptor.getSPSSODescriptor("urn:oasis:names:tc:SAML:1.1:protocol")
.getDefaultAttributeConsumingService();
- Assert.assertTrue(acs.getObjectMetadata().get(AttributesMapContainer.class).isEmpty());
+ assertTrue(acs.getObjectMetadata().get(AttributesMapContainer.class).isEmpty());
processor.process(acs);
@@ -136,24 +140,24 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
final Multimap<String, IdPRequestedAttribute> map = container.get();
- Assert.assertEquals(map.size(), 3);
+ assertEquals(map.size(), 3);
Collection<IdPRequestedAttribute> attribute = map.get("dn1");
- Assert.assertEquals(attribute.size(), 1);
+ assertEquals(attribute.size(), 1);
IdPRequestedAttribute attr = attribute.iterator().next();
- Assert.assertTrue(attr.getValues().isEmpty());
- Assert.assertFalse(attr.getIsRequired());
+ assertTrue(attr.getValues().isEmpty());
+ assertFalse(attr.getIsRequired());
attribute = map.get("dn2");
- Assert.assertEquals(attribute.size(), 1);
+ assertEquals(attribute.size(), 1);
attr = attribute.iterator().next();
- Assert.assertTrue(attr.getValues().isEmpty());
- Assert.assertTrue(attr.getIsRequired());
+ assertTrue(attr.getValues().isEmpty());
+ assertTrue(attr.getIsRequired());
attribute = map.get("eppn");
- Assert.assertEquals(attribute.size(), 1);
+ assertEquals(attribute.size(), 1);
attr = attribute.iterator().next();
- Assert.assertTrue(attr.getValues().isEmpty());
- Assert.assertFalse(attr.getIsRequired());
+ assertTrue(attr.getValues().isEmpty());
+ assertFalse(attr.getIsRequired());
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 55cb990..62aebb4 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -17,6 +17,10 @@
package net.shibboleth.idp.attribute.resolver.spring;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -37,7 +41,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
-import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
@@ -186,7 +189,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
serviceableComponent = attributeResolverService.getServiceableComponent();
final AttributeResolver resolver = serviceableComponent.getComponent();
- Assert.assertEquals(resolver.getId(), "Shibboleth.Resolver");
+ assertEquals(resolver.getId(), "Shibboleth.Resolver");
resolver.resolveAttributes(resolutionContext);
} finally {
if (null != serviceableComponent) {
@@ -197,92 +200,92 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
final Map<String, IdPAttribute> resolvedAttributes = resolutionContext.getResolvedIdPAttributes();
log.debug("resolved attributes '{}'", resolvedAttributes);
- Assert.assertEquals(resolvedAttributes.size(), 14);
+ assertEquals(resolvedAttributes.size(), 14);
// Static
IdPAttribute attribute = resolvedAttributes.get("eduPersonAffiliation");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
List<IdPAttributeValue<?>> values = attribute.getValues();
- Assert.assertEquals(values.size(), expectedEPAValues);
- Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+ assertEquals(values.size(), expectedEPAValues);
+ assertTrue(values.contains(new StringAttributeValue("member")));
// Broken (case 665)
attribute = resolvedAttributes.get("broken");
- Assert.assertEquals(attribute.getValues().size(), 2+expectedEPAValues);
+ assertEquals(attribute.getValues().size(), 2+expectedEPAValues);
attribute = resolvedAttributes.get("broken2");
- Assert.assertEquals(attribute.getValues().size(), 2+expectedEPAValues);
+ assertEquals(attribute.getValues().size(), 2+expectedEPAValues);
// LDAP
attribute = resolvedAttributes.get("uid");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("PETER_THE_PRINCIPAL")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("PETER_THE_PRINCIPAL")));
attribute = resolvedAttributes.get("email");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
- Assert.assertTrue(values.contains(new StringAttributeValue("peter.principal at shibboleth.net")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
+ assertTrue(values.contains(new StringAttributeValue("peter.principal at shibboleth.net")));
attribute = resolvedAttributes.get("surname");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("Principal")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("Principal")));
attribute = resolvedAttributes.get("commonName");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 3);
- Assert.assertTrue(values.contains(new StringAttributeValue("Peter Principal")));
- Assert.assertTrue(values.contains(new StringAttributeValue("Peter J Principal")));
- Assert.assertTrue(values.contains(new StringAttributeValue("pete principal")));
+ assertEquals(values.size(), 3);
+ assertTrue(values.contains(new StringAttributeValue("Peter Principal")));
+ assertTrue(values.contains(new StringAttributeValue("Peter J Principal")));
+ assertTrue(values.contains(new StringAttributeValue("pete principal")));
attribute = resolvedAttributes.get("homePhone");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("555-111-2222")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("555-111-2222")));
// Computed
attribute = resolvedAttributes.get("eduPersonTargetedID");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
+ assertEquals(values.size(), 1);
attribute = resolvedAttributes.get("pagerNumber");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("555-123-4567")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("555-123-4567")));
attribute = resolvedAttributes.get("mobileNumber");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("444-123-4567")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("444-123-4567")));
attribute = resolvedAttributes.get("street");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("TheStreet")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("TheStreet")));
attribute = resolvedAttributes.get("title");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("Monsieur")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("Monsieur")));
attribute = resolvedAttributes.get("departmentNumber");
- Assert.assertNotNull(attribute);
+ assertNotNull(attribute);
values = attribute.getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("#4321")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("#4321")));
final NameID nameId = new NameIDBuilder().buildObject();
nameId.setFormat("urn:mace:shibboleth:1.0:nameIdentifier");
@@ -310,7 +313,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
serviceableComponent = attributeResolverService.getServiceableComponent();
final AttributeResolver resolver = serviceableComponent.getComponent();
- Assert.assertEquals(resolver.getId(), "Shibboleth.Resolver");
+ assertEquals(resolver.getId(), "Shibboleth.Resolver");
resolver.resolveAttributes(resolutionContext);
} finally {
if (null != serviceableComponent) {
@@ -320,7 +323,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
final Map<String, IdPAttribute> resolvedAttributes = resolutionContext.getResolvedIdPAttributes();
log.debug("output {}", resolvedAttributes);
- Assert.assertEquals(resolvedAttributes.get("testing").getValues().size(), 2);
+ assertEquals(resolvedAttributes.get("testing").getValues().size(), 2);
}
@Test public void id() throws ComponentInitializationException, ServiceException, ResolutionException {
@@ -335,7 +338,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
serviceableComponent = attributeResolverService.getServiceableComponent();
final AttributeResolver resolver = serviceableComponent.getComponent();
- Assert.assertEquals(resolver.getId(), "TestID");
+ assertEquals(resolver.getId(), "TestID");
} finally {
if (null != serviceableComponent) {
serviceableComponent.unpinComponent();
@@ -374,17 +377,17 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
resolver.resolveAttributes(resolutionContext);
- Assert.assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
- Assert.assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPA1"));
+ assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
+ assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPA1"));
resolutionContext = TestSources.createResolutionContext("PRINCIPAL", "ISSUER", "recipient");
resolver.resolveAttributes(resolutionContext);
- Assert.assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
- Assert.assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPE"));
+ assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
+ assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPE"));
resolutionContext = TestSources.createResolutionContext("OTHER", "issuer", "recipient");
resolver.resolveAttributes(resolutionContext);
- Assert.assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
+ assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
}
@Test public void selectiveNavigate() throws ResolutionException {
@@ -405,25 +408,25 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
TestSources.createResolutionContext("PETER", "issuer", "recipient");
resolver.resolveAttributes(resolutionContext);
// this should fail since navigation failed.
- Assert.assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 0);
+ assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 0);
resolutionContext =
TestSources.createResolutionContext("PETER", "issuer", "recipient");
// add a child so we can navigate via that
resolutionContext.getSubcontext(ProfileRequestContext.class, true);
resolver.resolveAttributes(resolutionContext);
- Assert.assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
- Assert.assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPA1"));
+ assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
+ assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPA1"));
resolutionContext = TestSources.createResolutionContext("PRINCIPAL", "ISSUER", "recipient");
resolutionContext.getSubcontext(ProfileRequestContext.class, true);
resolver.resolveAttributes(resolutionContext);
- Assert.assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
- Assert.assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPE"));
+ assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
+ assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPE"));
resolutionContext = TestSources.createResolutionContext("OTHER", "issuer", "recipient");
resolver.resolveAttributes(resolutionContext);
- Assert.assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
+ assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
}
@Test public void multiFile() throws ResolutionException {
@@ -437,7 +440,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
serviceableComponent = attributeResolverService.getServiceableComponent();
final AttributeResolver resolver = serviceableComponent.getComponent();
- Assert.assertEquals(resolver.getId(), "MultiFileResolver");
+ assertEquals(resolver.getId(), "MultiFileResolver");
resolver.resolveAttributes(resolutionContext);
} finally {
if (null != serviceableComponent) {
@@ -445,7 +448,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
}
}
- Assert.assertNotNull(resolutionContext.getResolvedIdPAttributes().get("eduPersonAffiliation2"));
+ assertNotNull(resolutionContext.getResolvedIdPAttributes().get("eduPersonAffiliation2"));
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
index ea34367..082fc1f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
@@ -17,10 +17,19 @@
package net.shibboleth.idp.attribute.resolver.spring;
+import static org.testng.Assert.assertEquals;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.AfterMethod;
+
import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
@@ -36,14 +45,6 @@ import net.shibboleth.idp.attribute.resolver.spring.ad.impl.SimpleAttributeDefin
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ConversionServiceFactoryBean;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-
/**
* Base class for tests for {@link SimpleAttributeDefinitionParser} and by extension {@link BaseAttributeDefinitionParser}.
*
@@ -109,7 +110,7 @@ public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBase
context.refresh();
final Collection<Type> beans = context.getBeansOfType(claz).values();
- Assert.assertEquals(beans.size(), 1);
+ assertEquals(beans.size(), 1);
return beans.iterator().next();
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
index 3a26c58..f20651a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
@@ -17,15 +17,18 @@
package net.shibboleth.idp.attribute.resolver.spring;
-import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
-import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
+import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
+
/**
*
*/
@@ -34,20 +37,20 @@ public class DependencyTypesTest extends BaseAttributeDefinitionParserTest {
@Test public void xmlList() {
final ResolverDataConnectorDependency re = getBean(BEAN_FILE_PATH + "inputDataConnector1.xml", ResolverDataConnectorDependency.class, new GenericApplicationContext());
- Assert.assertEquals(re.getDependencyPluginId(), "DC1");
- Assert.assertFalse(re.isAllAttributes());
- Assert.assertEquals(re.getAttributeNames().size(), 3);
- Assert.assertTrue(re.getAttributeNames().contains("1"));
- Assert.assertTrue(re.getAttributeNames().contains("2"));
- Assert.assertTrue(re.getAttributeNames().contains("3"));
+ assertEquals(re.getDependencyPluginId(), "DC1");
+ assertFalse(re.isAllAttributes());
+ assertEquals(re.getAttributeNames().size(), 3);
+ assertTrue(re.getAttributeNames().contains("1"));
+ assertTrue(re.getAttributeNames().contains("2"));
+ assertTrue(re.getAttributeNames().contains("3"));
}
@Test public void allAttributeDataConnector() {
final ResolverDataConnectorDependency re = getBean(BEAN_FILE_PATH + "inputDataConnector2.xml", ResolverDataConnectorDependency.class, new GenericApplicationContext());
- Assert.assertEquals(re.getDependencyPluginId(), "DC2");
- Assert.assertTrue(re.isAllAttributes());
- Assert.assertTrue(re.getAttributeNames().isEmpty());
+ assertEquals(re.getDependencyPluginId(), "DC2");
+ assertTrue(re.isAllAttributes());
+ assertTrue(re.getAttributeNames().isEmpty());
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void bothAttributeDataConnector() {
@@ -61,14 +64,14 @@ public class DependencyTypesTest extends BaseAttributeDefinitionParserTest {
@Test public void attributeInput() {
final ResolverAttributeDefinitionDependency re = getBean(BEAN_FILE_PATH + "inputAttributeDefinition1.xml", ResolverAttributeDefinitionDependency.class, new GenericApplicationContext());
- Assert.assertEquals(re.getDependencyPluginId(), "AD1");
+ assertEquals(re.getDependencyPluginId(), "AD1");
}
@Test(dependsOnMethods={"attributeInput", "allAttributeDataConnector"}) public void simple() {
final AttributeDefinition attr = getBean(BEAN_FILE_PATH + "simpleDependencies.xml", AttributeDefinition.class, new GenericApplicationContext());
- Assert.assertEquals(attr.getDataConnectorDependencies().size(), 1);
- Assert.assertEquals(attr.getAttributeDependencies().size(), 1);
+ assertEquals(attr.getDataConnectorDependencies().size(), 1);
+ assertEquals(attr.getAttributeDependencies().size(), 1);
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
index a034500..23dfb5c 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
@@ -17,6 +17,9 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -24,7 +27,6 @@ import java.util.Map;
import javax.security.auth.Subject;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -76,9 +78,9 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("Whatever")).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")));
}
@@ -88,9 +90,9 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("BeanWhatever")).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 context() throws ResolutionException {
@@ -99,9 +101,9 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("BeanWhatever")).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 warn() throws ResolutionException {
@@ -109,9 +111,9 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
getAttributeDefn("resolver/subjectDerivedWarn.xml", ContextDerivedAttributeDefinition.class);
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("Whatever")).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(expectedExceptions = {BeanDefinitionStoreException.class}) public void fail() throws ResolutionException {
@@ -122,4 +124,4 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
throws ResolutionException {
getAttributeDefn("resolver/subjectDerivedDependency.xml", ContextDerivedAttributeDefinition.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
index 6ec71c2..d106325 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
@@ -17,13 +17,14 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.ad.impl.PrescopedAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrescopedAttributeDefinitionParser;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for {@link PrescopedAttributeDefinitionParser}.
*/
@@ -33,15 +34,15 @@ public class PrescopedAttributeDefinitionParserTest extends BaseAttributeDefinit
PrescopedAttributeDefinition attrDef =
getAttributeDefn("resolver/prescopedWith.xml", PrescopedAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "prescopedWith");
- Assert.assertEquals(attrDef.getScopeDelimiter(), "#");
+ assertEquals(attrDef.getId(), "prescopedWith");
+ assertEquals(attrDef.getScopeDelimiter(), "#");
}
@Test public void withoutScope() {
PrescopedAttributeDefinition attrDef =
getAttributeDefn("resolver/prescopedWithout.xml", PrescopedAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "prescopedWith");
- Assert.assertEquals(attrDef.getScopeDelimiter(), "@");
+ assertEquals(attrDef.getId(), "prescopedWith");
+ assertEquals(attrDef.getScopeDelimiter(), "@");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
index 4e7d1c2..51f1384 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
@@ -17,7 +17,8 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalNameAttributeDefinition;
@@ -33,7 +34,7 @@ public class PrincipalNameAttributeDefinitionParserTest extends BaseAttributeDef
PrincipalNameAttributeDefinition attrDef =
getAttributeDefn("resolver/principalName.xml", PrincipalNameAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "PrincipalName");
+ assertEquals(attrDef.getId(), "PrincipalName");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
index 09621fc..37e49c8 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
@@ -17,10 +17,14 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.regex.Pattern;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.ad.impl.RegexSplitAttributeDefinition;
@@ -36,45 +40,45 @@ public class RegexSplitAttributeDefinitionParserTest extends BaseAttributeDefini
RegexSplitAttributeDefinition attrDef =
getAttributeDefn("resolver/regexDefault.xml", RegexSplitAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "regexSplitDefault");
+ assertEquals(attrDef.getId(), "regexSplitDefault");
Pattern pat = attrDef.getRegularExpression();
- Assert.assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
- Assert.assertFalse(pat.matcher("AT1-foobleconneECTOR").matches());
+ assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
+ assertFalse(pat.matcher("AT1-foobleconneECTOR").matches());
}
@Test public void sensitive() {
RegexSplitAttributeDefinition attrDef =
getAttributeDefn("resolver/regexSensitive.xml", RegexSplitAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "regexSplitSensitive");
+ assertEquals(attrDef.getId(), "regexSplitSensitive");
Pattern pat = attrDef.getRegularExpression();
- Assert.assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
- Assert.assertFalse(pat.matcher("AT1-foobleconneECTOR").matches());
+ assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
+ assertFalse(pat.matcher("AT1-foobleconneECTOR").matches());
}
@Test public void insensitive() {
RegexSplitAttributeDefinition attrDef =
getAttributeDefn("resolver/regexInsensitive.xml", RegexSplitAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "regexSplitInsensitive");
+ assertEquals(attrDef.getId(), "regexSplitInsensitive");
Pattern pat = attrDef.getRegularExpression();
- Assert.assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
- Assert.assertTrue(pat.matcher("AT1-foobleconneECTOR").matches());
+ assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
+ assertTrue(pat.matcher("AT1-foobleconneECTOR").matches());
}
@Test public void none() {
try {
getAttributeDefn("regexNone.xml", RegexSplitAttributeDefinition.class);
- Assert.fail();
+ fail();
} catch (BeanDefinitionStoreException e) {
// OK
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
index 02499ed..7590671 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
@@ -17,7 +17,9 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
@@ -33,18 +35,18 @@ public class SAML1NameIdentifierAttributeDefinitionParserTest extends BaseAttrib
SAML1NameIdentifierAttributeDefinition attrDef =
getAttributeDefn("resolver/saml1NameIdDefault.xml", SAML1NameIdentifierAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "SAML1NameIdentifier");
- Assert.assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertNull(attrDef.getNameIdQualifier());
+ assertEquals(attrDef.getId(), "SAML1NameIdentifier");
+ assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertNull(attrDef.getNameIdQualifier());
}
@Test public void attributes() {
SAML1NameIdentifierAttributeDefinition attrDef = getAttributeDefn("resolver/saml1NameIdentifierAttributes.xml",
SAML1NameIdentifierAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "SAML1NameIdentifierAttributes");
- Assert.assertEquals(attrDef.getNameIdFormat(), "format");
- Assert.assertEquals(attrDef.getNameIdQualifier(), "qualifier");
+ assertEquals(attrDef.getId(), "SAML1NameIdentifierAttributes");
+ assertEquals(attrDef.getNameIdFormat(), "format");
+ assertEquals(attrDef.getNameIdQualifier(), "qualifier");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
index 1cb0464..2e64acbe 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
@@ -17,7 +17,9 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
@@ -33,18 +35,18 @@ public class SAML2NameIDdentifierAttributeDefinitionParserTest extends BaseAttri
SAML2NameIDAttributeDefinition attrDef =
getAttributeDefn("resolver/saml2NameIdDefault.xml", SAML2NameIDAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "SAML2NameID");
- Assert.assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- Assert.assertNull(attrDef.getNameIdQualifier());
+ assertEquals(attrDef.getId(), "SAML2NameID");
+ assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+ assertNull(attrDef.getNameIdQualifier());
}
@Test public void attributes() {
SAML2NameIDAttributeDefinition attrDef =
getAttributeDefn("resolver/saml2NameIdAttributes.xml", SAML2NameIDAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "SAML2NameId-Attr");
- Assert.assertEquals(attrDef.getNameIdFormat(), "format");
- Assert.assertEquals(attrDef.getNameIdQualifier(), "qualifier");
- Assert.assertEquals(attrDef.getNameIdSPQualifier(), "name-Id-SP-Qualifier");
+ assertEquals(attrDef.getId(), "SAML2NameId-Attr");
+ assertEquals(attrDef.getNameIdFormat(), "format");
+ assertEquals(attrDef.getNameIdQualifier(), "qualifier");
+ assertEquals(attrDef.getNameIdSPQualifier(), "name-Id-SP-Qualifier");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
index 7dafbb1..b4d4381 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
@@ -17,7 +17,8 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.ad.impl.ScopedAttributeDefinition;
@@ -32,7 +33,7 @@ public class ScopedAttributeDefinitionParserTest extends BaseAttributeDefinition
@Test public void defaultCase() {
ScopedAttributeDefinition attrDef = getAttributeDefn("resolver/scoped.xml", ScopedAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "scoped");
- Assert.assertEquals(attrDef.getScope(), "mYsCoPe");
+ assertEquals(attrDef.getId(), "scoped");
+ assertEquals(attrDef.getScope(), "mYsCoPe");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
index 9b1d053..534858a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
@@ -17,16 +17,19 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.ScriptedAttributeDefinitionParser;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.fail;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.ad.impl.ScriptedAttributeDefinitionParser;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
/**
* Test for {@link ScriptedAttributeDefinitionParser}.
*/
@@ -36,20 +39,20 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
final ScriptedAttributeDefinition attrDef =
getAttributeDefn("resolver/scriptedAttributeInline.xml", ScriptedAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "scriptedInline");
- Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
- Assert.assertEquals(attrDef.getScript().getScript(), "foo=\"bar\";");
+ assertEquals(attrDef.getId(), "scriptedInline");
+ assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
+ assertEquals(attrDef.getScript().getScript(), "foo=\"bar\";");
}
@Test public void file() {
final ScriptedAttributeDefinition attrDef =
getAttributeDefn("resolver/scriptedAttributeFile.xml", ScriptedAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "scriptedFile");
- Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
- Assert.assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "foo=bar();");
+ assertEquals(attrDef.getId(), "scriptedFile");
+ assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
+ assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "foo=bar();");
- Assert.assertNull(attrDef.getCustomObject());
+ assertNull(attrDef.getCustomObject());
}
@@ -57,21 +60,21 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
ScriptedAttributeDefinition attrDef =
getAttributeDefn("resolver/scriptedAttributeDupl.xml", ScriptedAttributeDefinition.class, true);
- Assert.assertEquals(attrDef.getId(), "scriptedDupl");
- Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
- Assert.assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "stuff=\"stuff\";");
+ assertEquals(attrDef.getId(), "scriptedDupl");
+ assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
+ assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "stuff=\"stuff\";");
attrDef = getAttributeDefn("resolver/scriptedAttributeDuplFile.xml", ScriptedAttributeDefinition.class, true);
- Assert.assertEquals(attrDef.getId(), "scriptedDuplFile");
- Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
- Assert.assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "foo=bar();");
+ assertEquals(attrDef.getId(), "scriptedDuplFile");
+ assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
+ assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "foo=bar();");
}
@Test public void bad() {
try {
getAttributeDefn("resolver/scriptedAttributeBad.xml", ScriptedAttributeDefinition.class);
- Assert.fail("Bad script worked?");
+ fail("Bad script worked?");
} catch (BeanDefinitionStoreException | BeanCreationException e) {
// OK
}
@@ -80,7 +83,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
@Test public void absent() {
try {
getAttributeDefn("resolverscriptedAttributeAbsent.xml", ScriptedAttributeDefinition.class);
- Assert.fail("Missing script worked?");
+ fail("Missing script worked?");
} catch (final BeanDefinitionStoreException e) {
// OK
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
index 54b112b..2857dd6 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
@@ -17,6 +17,10 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -29,7 +33,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.mock.env.MockPropertySource;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
@@ -55,12 +58,12 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
AttributeDefinition attrDef =
getAttributeDefn("resolver/simpleAttributeUnpopulated.xml", SimpleAttributeDefinition.class);
- Assert.assertEquals(attrDef.getId(), "simpleUnpopulated");
- Assert.assertFalse(attrDef.isDependencyOnly(), "isDependencyOnly");
- Assert.assertTrue(attrDef.getDisplayDescriptions().isEmpty(), "getDisplayDescriptions().isEmpty()");
- Assert.assertTrue(attrDef.getDisplayNames().isEmpty(), "getDisplayNames().isEmpty()");
- Assert.assertEquals(attrDef.getAttributeDependencies().size(), 1);
- Assert.assertTrue(attrDef.getAttributeEncoders().isEmpty(), "getgetAttributeEncoders().isEmpty()");
+ assertEquals(attrDef.getId(), "simpleUnpopulated");
+ assertFalse(attrDef.isDependencyOnly(), "isDependencyOnly");
+ assertTrue(attrDef.getDisplayDescriptions().isEmpty(), "getDisplayDescriptions().isEmpty()");
+ assertTrue(attrDef.getDisplayNames().isEmpty(), "getDisplayNames().isEmpty()");
+ assertEquals(attrDef.getAttributeDependencies().size(), 1);
+ assertTrue(attrDef.getAttributeEncoders().isEmpty(), "getgetAttributeEncoders().isEmpty()");
}
@Test public void simplePopulated() throws ComponentInitializationException {
@@ -69,36 +72,36 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
attrDef.initialize();
- Assert.assertEquals(attrDef.getId(), "simplePopulated");
- Assert.assertTrue(attrDef.isDependencyOnly(), "isDependencyOnly");
+ assertEquals(attrDef.getId(), "simplePopulated");
+ assertTrue(attrDef.isDependencyOnly(), "isDependencyOnly");
final Map<Locale, String> descriptions = attrDef.getDisplayDescriptions();
- Assert.assertEquals(descriptions.size(), 3, "getDisplayDescriptions");
- Assert.assertEquals(descriptions.get(new Locale("en")), "DescInEnglish");
- Assert.assertEquals(descriptions.get(new Locale("fr")), "DescEnFrancais");
- Assert.assertEquals(descriptions.get(new Locale("ca")), "DescInCanadian");
+ assertEquals(descriptions.size(), 3, "getDisplayDescriptions");
+ assertEquals(descriptions.get(new Locale("en")), "DescInEnglish");
+ assertEquals(descriptions.get(new Locale("fr")), "DescEnFrancais");
+ assertEquals(descriptions.get(new Locale("ca")), "DescInCanadian");
final Map<Locale, String> names = attrDef.getDisplayNames();
- Assert.assertEquals(names.size(), 2, "getDisplayNames");
- Assert.assertEquals(names.get(new Locale("en")), "NameInEnglish");
- Assert.assertEquals(names.get(new Locale("fr")), "NameEnFrancais");
+ assertEquals(names.size(), 2, "getDisplayNames");
+ assertEquals(names.get(new Locale("en")), "NameInEnglish");
+ assertEquals(names.get(new Locale("fr")), "NameEnFrancais");
Set<ResolverAttributeDefinitionDependency> adDeps = attrDef.getAttributeDependencies();
- Assert.assertEquals(adDeps.size(), 2, "getAttributeDependencies");
- Assert.assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep2")));
- Assert.assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
+ assertEquals(adDeps.size(), 2, "getAttributeDependencies");
+ assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep2")));
+ assertTrue(adDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
Set<ResolverDataConnectorDependency> dcDeps = attrDef.getDataConnectorDependencies();
- Assert.assertEquals(dcDeps.size(), 1, "getDataConnectorDependencies");
+ assertEquals(dcDeps.size(), 1, "getDataConnectorDependencies");
final ResolverDataConnectorDependency dcDep = dcDeps.iterator().next();
- Assert.assertEquals(dcDep.getDependencyPluginId(), "con1");
- Assert.assertTrue(dcDep.getAttributeNames().contains("dep1"));
+ assertEquals(dcDep.getDependencyPluginId(), "con1");
+ assertTrue(dcDep.getAttributeNames().contains("dep1"));
- Assert.assertEquals(attrDef.getAttributeEncoders().size(), 1);
+ assertEquals(attrDef.getAttributeEncoders().size(), 1);
final SAML2StringAttributeEncoder e1 =
(SAML2StringAttributeEncoder) attrDef.getAttributeEncoders().iterator().next();
- Assert.assertEquals(e1.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
- Assert.assertEquals(e1.getFriendlyName(), "mail");
+ assertEquals(e1.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
+ assertEquals(e1.getFriendlyName(), "mail");
}
@@ -108,24 +111,24 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
attrDef.initialize();
- Assert.assertEquals(attrDef.getId(), "simplePopulated2");
- Assert.assertFalse(attrDef.isDependencyOnly(), "isDependencyOnly");
+ assertEquals(attrDef.getId(), "simplePopulated2");
+ assertFalse(attrDef.isDependencyOnly(), "isDependencyOnly");
- Assert.assertTrue(attrDef.getDisplayDescriptions().isEmpty(), "getDisplayDescriptions().isEmpty()");
+ assertTrue(attrDef.getDisplayDescriptions().isEmpty(), "getDisplayDescriptions().isEmpty()");
final Map<Locale, String> names = attrDef.getDisplayNames();
- Assert.assertEquals(names.size(), 1, "getDisplayNames");
- Assert.assertEquals(names.get(new Locale("en")), "NameInAmerican");
+ assertEquals(names.size(), 1, "getDisplayNames");
+ assertEquals(names.get(new Locale("en")), "NameInAmerican");
final Set<ResolverAttributeDefinitionDependency> attrDeps = attrDef.getAttributeDependencies();
- Assert.assertEquals(attrDeps.size(), 1, "getAttributeDependencies");
- Assert.assertTrue(attrDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
+ assertEquals(attrDeps.size(), 1, "getAttributeDependencies");
+ assertTrue(attrDeps.contains(TestSources.makeAttributeDefinitionDependency("dep3")));
final Set<ResolverDataConnectorDependency> dcDeps = attrDef.getDataConnectorDependencies();
- Assert.assertEquals(dcDeps.size(), 0, "getDataConnectorDependencies");
+ assertEquals(dcDeps.size(), 0, "getDataConnectorDependencies");
- Assert.assertEquals(attrDef.getAttributeEncoders().size(), 2);
+ assertEquals(attrDef.getAttributeEncoders().size(), 2);
final List a = new ArrayList(attrDef.getAttributeEncoders());
final SAML2StringAttributeEncoder saml2;
@@ -137,10 +140,10 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
saml2 = (SAML2StringAttributeEncoder) a.get(1);
saml1 = (SAML1StringAttributeEncoder) a.get(0);
}
- Assert.assertEquals(saml2.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
- Assert.assertEquals(saml2.getFriendlyName(), "mail");
+ assertEquals(saml2.getName(), "urn:oid:0.9.2342.19200300.100.1.3");
+ assertEquals(saml2.getFriendlyName(), "mail");
- Assert.assertEquals(saml1.getName(), "urn:mace:dir:attribute-def:mail");
+ assertEquals(saml1.getName(), "urn:mace:dir:attribute-def:mail");
}
@Test public void bad() throws ComponentInitializationException {
@@ -167,10 +170,10 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
ProfileRequestContext prc = new ProfileRequestContext<>();
RelyingPartyContext rpContext = prc.getSubcontext(RelyingPartyContext.class, true);
rpContext.setRelyingPartyId("p1");
- Assert.assertTrue(pre.test(prc));
+ assertTrue(pre.test(prc));
rpContext.setRelyingPartyId("p2 p3");
- Assert.assertFalse(pre.test(prc));
+ assertFalse(pre.test(prc));
rpContext.setRelyingPartyId("p3");
- Assert.assertTrue(pre.test(prc));
+ assertTrue(pre.test(prc));
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
index 696267e..dcc9d14 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
@@ -17,7 +17,10 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.ad.impl.TemplateAttributeDefinition;
@@ -35,9 +38,9 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
final TemplateAttributeDefinition defn =
getAttributeDefn("resolver/templateNoAttributes.xml", "externalBeans.xml", TemplateAttributeDefinition.class);
- Assert.assertEquals(defn.getId(), "templateId");
- Assert.assertNull(defn.getTemplateText());
- Assert.assertTrue(defn.getSourceAttributes().isEmpty());
+ assertEquals(defn.getId(), "templateId");
+ assertNull(defn.getTemplateText());
+ assertTrue(defn.getSourceAttributes().isEmpty());
}
@Test public void withAttr() throws ComponentInitializationException {
@@ -45,11 +48,11 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
final TemplateAttributeDefinition defn =
getAttributeDefn("resolver/templateAttributes.xml", "velocity2.xml", TemplateAttributeDefinition.class);
- Assert.assertEquals(defn.getId(), "templateIdAttr");
- Assert.assertEquals(defn.getTemplateText(), "TheTemplate");
- Assert.assertEquals(defn.getSourceAttributes().size(), 2);
- Assert.assertTrue(defn.getSourceAttributes().contains("att1"));
- Assert.assertTrue(defn.getSourceAttributes().contains("att2"));
+ assertEquals(defn.getId(), "templateIdAttr");
+ assertEquals(defn.getTemplateText(), "TheTemplate");
+ assertEquals(defn.getSourceAttributes().size(), 2);
+ assertTrue(defn.getSourceAttributes().contains("att1"));
+ assertTrue(defn.getSourceAttributes().contains("att2"));
}
@Test public void dupl() throws ComponentInitializationException {
@@ -57,11 +60,11 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
final TemplateAttributeDefinition defn =
getAttributeDefn("resolver/templateTwoTemplate.xml", "velocity2.xml", TemplateAttributeDefinition.class);
- Assert.assertEquals(defn.getId(), "templateIdAttr");
- Assert.assertEquals(defn.getTemplateText(), "TheTemplate");
- Assert.assertEquals(defn.getSourceAttributes().size(), 2);
- Assert.assertTrue(defn.getSourceAttributes().contains("att1"));
- Assert.assertTrue(defn.getSourceAttributes().contains("att2"));
+ assertEquals(defn.getId(), "templateIdAttr");
+ assertEquals(defn.getTemplateText(), "TheTemplate");
+ assertEquals(defn.getSourceAttributes().size(), 2);
+ assertTrue(defn.getSourceAttributes().contains("att1"));
+ assertTrue(defn.getSourceAttributes().contains("att2"));
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
index bede381..11ec9c1 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
@@ -17,14 +17,19 @@
package net.shibboleth.idp.attribute.resolver.spring.ad.mapped;
-import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.MappedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.MappedAttributeDefinitionParser;
+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 org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.MappedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.MappedAttributeDefinitionParser;
+
/**
* Test for {@link MappedAttributeDefinitionParser}.
*/
@@ -37,32 +42,32 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
@Test public void multiDefault() {
final MappedAttributeDefinition defn = getDefinition("resolver/multiDefault.xml");
- Assert.assertTrue(defn.isPassThru());
- Assert.assertEquals(defn.getValueMaps().size(), 2);
- Assert.assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
+ assertTrue(defn.isPassThru());
+ assertEquals(defn.getValueMaps().size(), 2);
+ assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
}
@Test public void defaultCase() {
final MappedAttributeDefinition defn = getDefinition("resolver/mapped.xml");
- Assert.assertTrue(defn.isPassThru());
- Assert.assertEquals(defn.getValueMaps().size(), 2);
- Assert.assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
+ assertTrue(defn.isPassThru());
+ assertEquals(defn.getValueMaps().size(), 2);
+ assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
}
@Test public void noDefault() {
final MappedAttributeDefinition defn = getDefinition("resolver/mappedNoDefault.xml");
- Assert.assertFalse(defn.isPassThru());
- Assert.assertEquals(defn.getValueMaps().size(), 1);
- Assert.assertNull(defn.getDefaultAttributeValue());
+ assertFalse(defn.isPassThru());
+ assertEquals(defn.getValueMaps().size(), 1);
+ assertNull(defn.getDefaultAttributeValue());
}
@Test public void noValues() {
try {
getDefinition("resolver/mappedNoValueMap.xml");
- Assert.fail();
+ fail();
} catch (final BeanDefinitionStoreException e) {
// OK
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
index a00da50..a8f59be 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
@@ -17,8 +17,13 @@
package net.shibboleth.idp.attribute.resolver.spring.ad.mapped;
+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 org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.SourceValue;
@@ -43,11 +48,11 @@ public class SourceValueParserTest extends BaseAttributeDefinitionParserTest {
@Test public void simple() {
SourceValue value = getSourceValue("resolver/sourceValue.xml");
- Assert.assertFalse(value.isIgnoreCase());
- Assert.assertFalse(value.isPartialMatch());
+ assertFalse(value.isIgnoreCase());
+ assertFalse(value.isPartialMatch());
try {
- Assert.assertNull(value.getValue());
- Assert.fail();
+ assertNull(value.getValue());
+ fail();
} catch (ConstraintViolationException e) {
}
@@ -56,21 +61,21 @@ public class SourceValueParserTest extends BaseAttributeDefinitionParserTest {
@Test public void values1() {
SourceValue value = getSourceValue("resolver/sourceValueAttributes1.xml");
- Assert.assertTrue(value.isIgnoreCase());
- Assert.assertTrue(value.isPartialMatch());
- Assert.assertEquals(value.getValue(), "sourceValueAttributes1");
+ assertTrue(value.isIgnoreCase());
+ assertTrue(value.isPartialMatch());
+ assertEquals(value.getValue(), "sourceValueAttributes1");
}
@Test public void values2() {
SourceValue value = getSourceValue("resolver/sourceValueAttributes2.xml");
- Assert.assertFalse(value.isIgnoreCase());
- Assert.assertFalse(value.isPartialMatch());
+ assertFalse(value.isIgnoreCase());
+ assertFalse(value.isPartialMatch());
try {
- Assert.assertEquals(value.getValue(), "sourceValueAttributes2");
- Assert.fail();
+ assertEquals(value.getValue(), "sourceValueAttributes2");
+ fail();
} catch (ConstraintViolationException e) {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
index c4f2520..e7225aa 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
@@ -17,15 +17,17 @@
package net.shibboleth.idp.attribute.resolver.spring.ad.mapped;
-import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.ValueMap;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.ValueMapParser;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.ValueMap;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.ValueMapParser;
+
/**
* Test for {@link ValueMapParser}.
*/
@@ -43,9 +45,9 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
@Test public void valueMap() {
final ValueMap value = getValueMap("valueMap.xml");
- Assert.assertEquals(value.getReturnValue(), "return");
- Assert.assertEquals(value.getSourceValues().size(), 1);
- Assert.assertEquals(value.getSourceValues().iterator().next().getPattern().pattern(), "source");
+ assertEquals(value.getReturnValue(), "return");
+ assertEquals(value.getSourceValues().size(), 1);
+ assertEquals(value.getSourceValues().iterator().next().getPattern().pattern(), "source");
}
@@ -53,7 +55,7 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
try {
getValueMap("valueMapNoSourceValue.xml");
- Assert.fail();
+ fail();
} catch (final BeanDefinitionStoreException e) {
// OK
}
@@ -63,7 +65,7 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
try {
getValueMap("valueMapNoValues.xml");
- Assert.fail();
+ fail();
} catch (final BeanDefinitionStoreException e) {
// OK
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
index e031b73..cca7b0b 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
@@ -17,12 +17,14 @@
package net.shibboleth.idp.attribute.resolver.spring.dc;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.mock.env.MockPropertySource;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
@@ -43,36 +45,36 @@ public class ComputedIdDataConnectorParserTest extends BaseAttributeDefinitionPa
final PairwiseIdDataConnector connector = getDataConnector("resolver/computed.xml", PairwiseIdDataConnector.class);
final ComputedPairwiseIdStore store = (ComputedPairwiseIdStore) connector.getPairwiseIdStore();
- Assert.assertEquals(connector.getId(), "computed");
- Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
- Assert.assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
- Assert.assertEquals(connector.getSourceAttributeInformation(), "theSourceRemainsTheSame");
- Assert.assertEquals(store.getAlgorithm(), "SHA256");
- Assert.assertEquals(store.getEncoding(), Encoding.BASE32);
-
- Assert.assertTrue(connector.isInitialized());
+ assertEquals(connector.getId(), "computed");
+ assertEquals(connector.getGeneratedAttributeId(), "jenny");
+ assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
+ assertEquals(connector.getSourceAttributeInformation(), "theSourceRemainsTheSame");
+ assertEquals(store.getAlgorithm(), "SHA256");
+ assertEquals(store.getEncoding(), Encoding.BASE32);
+
+ assertTrue(connector.isInitialized());
}
@Test public void resolverDataConnector() throws ComponentInitializationException {
final PairwiseIdDataConnector connector = getDataConnector("resolver/computedDataConnector.xml", PairwiseIdDataConnector.class);
final ComputedPairwiseIdStore store = (ComputedPairwiseIdStore) connector.getPairwiseIdStore();
- Assert.assertEquals(connector.getId(), "computed");
- Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
- Assert.assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
- Assert.assertEquals(connector.getSourceAttributeInformation(), "DC/theSourceRemainsTheSame");
+ assertEquals(connector.getId(), "computed");
+ assertEquals(connector.getGeneratedAttributeId(), "jenny");
+ assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
+ assertEquals(connector.getSourceAttributeInformation(), "DC/theSourceRemainsTheSame");
- Assert.assertTrue(connector.isInitialized());
+ assertTrue(connector.isInitialized());
}
@Test public void resolverNoSourceDependency() {
final PairwiseIdDataConnector connector = getDataConnector("resolver/computedNoSource1.xml", PairwiseIdDataConnector.class);
final ComputedPairwiseIdStore store = (ComputedPairwiseIdStore) connector.getPairwiseIdStore();
- Assert.assertEquals(connector.getId(), "computed");
- Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
- Assert.assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
- Assert.assertEquals(connector.getSourceAttributeInformation(), "theSourceRemainsTheSame");
+ assertEquals(connector.getId(), "computed");
+ assertEquals(connector.getGeneratedAttributeId(), "jenny");
+ assertEquals(store.getSalt(), "abcdefghijklmnopqrst ".getBytes());
+ assertEquals(connector.getSourceAttributeInformation(), "theSourceRemainsTheSame");
}
@@ -109,9 +111,9 @@ public class ComputedIdDataConnectorParserTest extends BaseAttributeDefinitionPa
final PairwiseIdDataConnector connector = context.getBean(PairwiseIdDataConnector.class);
final ComputedPairwiseIdStore store = (ComputedPairwiseIdStore) connector.getPairwiseIdStore();
- Assert.assertEquals(store.getSalt(), salt.getBytes());
- Assert.assertTrue(store.isInitialized());
- Assert.assertTrue(connector.isInitialized());
+ assertEquals(store.getSalt(), salt.getBytes());
+ assertTrue(store.isInitialized());
+ assertTrue(connector.isInitialized());
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
index 8e2778c..fee5f37 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
@@ -17,9 +17,15 @@
package net.shibboleth.idp.attribute.resolver.spring.dc;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.List;
import java.util.Map;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -32,10 +38,6 @@ import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.testing.TestSupport;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link ScriptDataConnectorParser}
*/
@@ -57,26 +59,26 @@ public class ScriptDataConnectorParserTest extends BaseAttributeDefinitionParser
final Map custom = (Map) dataConnector.getCustomObject();
- Assert.assertEquals(custom.size(), 1);
- Assert.assertEquals(custom.get("bar"), "foo");
+ assertEquals(custom.size(), 1);
+ assertEquals(custom.get("bar"), "foo");
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
final Map<String, IdPAttribute> result = dataConnector.resolve(context);
- Assert.assertEquals(result.size(), 2);
+ assertEquals(result.size(), 2);
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")));
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
index b3dd70a..e0ccb3f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
@@ -17,9 +17,11 @@
package net.shibboleth.idp.attribute.resolver.spring.dc;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.List;
-import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -37,46 +39,46 @@ public class StaticDataConnectorParserTest extends BaseAttributeDefinitionParser
@Test public void simple() {
final StaticDataConnector connector = getDataConnector("resolver/staticAttributes.xml", StaticDataConnector.class);
- Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
+ assertEquals(connector.getAttributes().keySet().size(), 2);
final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
List<IdPAttributeValue<?>> values = epe.getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
+ assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
values = connector.getAttributes().get("staticEpA").getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("member")));
}
@Test public void hybrid() {
final StaticDataConnector connector = getDataConnector("resolver/staticAttributesHybrid.xml", StaticDataConnector.class);
- Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
+ assertEquals(connector.getAttributes().keySet().size(), 2);
final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
List<IdPAttributeValue<?>> values = epe.getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
+ assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
values = connector.getAttributes().get("staticEpA").getValues();
- Assert.assertEquals(values.size(), 1);
- Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+ assertEquals(values.size(), 1);
+ assertTrue(values.contains(new StringAttributeValue("member")));
}
@Test public void nativesimple() {
final StaticDataConnector connector = getDataConnector("staticAttributesNative.xml", StaticDataConnector.class);
- Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
+ assertEquals(connector.getAttributes().keySet().size(), 2);
final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
List<IdPAttributeValue<?>> values = epe.getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
- Assert.assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
+ assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
values = connector.getAttributes().get("staticEpA").getValues();
- Assert.assertEquals(values.size(), 2);
- Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+ assertEquals(values.size(), 2);
+ assertTrue(values.contains(new StringAttributeValue("member")));
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
index 6e2115c..b03342b 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
@@ -17,13 +17,15 @@
package net.shibboleth.idp.attribute.resolver.spring.dc;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ResourceLoader;
-import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.collect.Collections2;
@@ -48,12 +50,12 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
final JDBCPairwiseIdStore store = (JDBCPairwiseIdStore) connector.getPairwiseIdStore();
- Assert.assertEquals(connector.getId(), "stored");
- Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
- Assert.assertEquals(store.getTransactionRetries(), 5);
- Assert.assertEquals(store.getQueryTimeout(), Duration.ofSeconds(5));
- Assert.assertEquals(store.getVerifyDatabase(), false);
- Assert.assertTrue(Arrays.equals(store.getRetryableErrors().toArray(), new String[]{"25000", "25001"}));
+ assertEquals(connector.getId(), "stored");
+ assertEquals(connector.getGeneratedAttributeId(), "jenny");
+ assertEquals(store.getTransactionRetries(), 5);
+ assertEquals(store.getQueryTimeout(), Duration.ofSeconds(5));
+ assertEquals(store.getVerifyDatabase(), false);
+ assertTrue(Arrays.equals(store.getRetryableErrors().toArray(), new String[]{"25000", "25001"}));
connector.initialize();
}
@@ -64,8 +66,8 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
final ComputedPairwiseIdStore store2 = (ComputedPairwiseIdStore) store.getInitialValueStore();
final ResolverAttributeDefinitionDependency attrib = connector.getAttributeDependencies().iterator().next();
- Assert.assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
- Assert.assertEquals(store2.getSalt(), "abcdefghijklmnopqrst".getBytes());
+ assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
+ assertEquals(store2.getSalt(), "abcdefghijklmnopqrst".getBytes());
testIt(connector);
}
@@ -91,8 +93,8 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
final ComputedPairwiseIdStore store2 = (ComputedPairwiseIdStore) store.getInitialValueStore();
final ResolverAttributeDefinitionDependency attrib = connector.getAttributeDependencies().iterator().next();
- Assert.assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
- Assert.assertEquals(store2.getSalt(), "abcdefghijklmnopqrst".getBytes());
+ assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
+ assertEquals(store2.getSalt(), "abcdefghijklmnopqrst".getBytes());
testIt(connector);
}
@@ -101,7 +103,7 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
@Test public void withOutSalt() throws ComponentInitializationException {
final PairwiseIdDataConnector connector = getDataConnector("resolver/storedNoSalt.xml", PairwiseIdDataConnector.class);
final ResolverAttributeDefinitionDependency attrib = connector.getAttributeDependencies().iterator().next();
- Assert.assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
+ assertEquals(attrib.getDependencyPluginId(), "theSourceRemainsTheSame");
testIt(connector);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
index 65ea74b..40f5570 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
@@ -17,6 +17,10 @@
package net.shibboleth.idp.attribute.resolver.spring.dc.http;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -28,7 +32,6 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.mock.env.MockPropertySource;
-import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -81,7 +84,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -89,16 +92,16 @@ public class HTTPDataConnectorParserTest {
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");
- Assert.assertTrue(connector.getResultsCache().size() == 1);
+ assertTrue(connector.getResultsCache().size() == 1);
}
@Test(expectedExceptions=ResolutionException.class) public void v2BadProtocol() throws Exception {
@@ -110,7 +113,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-badprotocol.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -130,7 +133,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -150,7 +153,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -168,7 +171,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-missingok.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -176,7 +179,7 @@ public class HTTPDataConnectorParserTest {
final Map<String,IdPAttribute> attrs = connector.resolve(context);
- Assert.assertTrue(attrs == null || attrs.isEmpty());
+ assertTrue(attrs == null || attrs.isEmpty());
}
@Test public void v2Certificate() throws Exception {
@@ -189,7 +192,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -199,14 +202,14 @@ public class HTTPDataConnectorParserTest {
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 v2BadCertificate() throws Exception {
@@ -219,7 +222,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -238,7 +241,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-ca.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -262,7 +265,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-clientcert.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -270,14 +273,14 @@ public class HTTPDataConnectorParserTest {
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 public void hybridConfig() throws Exception {
@@ -290,7 +293,7 @@ public class HTTPDataConnectorParserTest {
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-hybrid.xml",
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-spring-context.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -298,16 +301,16 @@ public class HTTPDataConnectorParserTest {
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");
- Assert.assertTrue(connector.getResultsCache().size() == 1);
+ assertTrue(connector.getResultsCache().size() == 1);
}
@Test(enabled=false) public void v2ConfigPOST() throws Exception {
@@ -321,7 +324,7 @@ public class HTTPDataConnectorParserTest {
final HTTPDataConnector connector =
getDataConnector(propSource,
"net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-body.xml");
- Assert.assertNotNull(connector);
+ assertNotNull(connector);
final AttributeResolutionContext context =
TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -329,14 +332,14 @@ public class HTTPDataConnectorParserTest {
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");
}
private HTTPDataConnector getDataConnector(final PropertySource propSource, final String... beanDefinitions)
@@ -369,4 +372,4 @@ public class HTTPDataConnectorParserTest {
return propSource;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index 60bcd19..4a9ef5d 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -17,6 +17,12 @@
package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.time.Duration;
@@ -74,8 +80,6 @@ import net.shibboleth.idp.attribute.resolver.dc.ldap.impl.StringAttributeValueMa
import net.shibboleth.idp.attribute.resolver.spring.dc.ldap.impl.LDAPDataConnectorParser;
import net.shibboleth.idp.saml.impl.TestSources;
-import static org.testng.Assert.*;
-
/** Test for {@link LDAPDataConnectorParser}. */
public class LDAPDataConnectorParserTest {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
index 67d700b..45a4e4e 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.resolver.spring.dc.rdbms;
+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 java.io.IOException;
import java.sql.SQLException;
import java.time.Duration;
@@ -34,7 +39,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePropertySource;
-import org.testng.Assert;
import org.testng.AssertJUnit;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeTest;
@@ -94,22 +98,22 @@ public class RDBMSDataConnectorParserTest {
@Test public void simpleConnector() throws Exception {
final RDBMSDataConnector dataConnector =
getRdbmsDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
final StringResultMappingStrategy mappingStrategy = (StringResultMappingStrategy) dataConnector.getMappingStrategy();
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
+ assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
+ assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
}
@Test public void v2Config() throws Exception {
final RDBMSDataConnector dataConnector =
getRdbmsDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
final StringResultMappingStrategy mappingStrategy = (StringResultMappingStrategy) dataConnector.getMappingStrategy();
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
+ assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
+ assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
}
@@ -118,11 +122,11 @@ public class RDBMSDataConnectorParserTest {
getRdbmsDataConnector(
"net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-hybrid.xml",
"net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
final StringResultMappingStrategy mappingStrategy = (StringResultMappingStrategy) dataConnector.getMappingStrategy();
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
- Assert.assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
+ assertEquals(mappingStrategy.getResultRenamingMap().size(), 1);
+ assertEquals(mappingStrategy.getResultRenamingMap().get("homephone"), "phonenumber");
}
@Test public void v2PropsConfig() throws Exception {
@@ -130,14 +134,14 @@ public class RDBMSDataConnectorParserTest {
final RDBMSDataConnector dataConnector =
getRdbmsDataConnector(props,
"net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-props.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
}
@Test public void springConfig() throws Exception {
final RDBMSDataConnector dataConnector =
getRdbmsDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
}
@@ -146,7 +150,7 @@ public class RDBMSDataConnectorParserTest {
final RDBMSDataConnector dataConnector =
getRdbmsDataConnector(props, "net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml");
- Assert.assertNotNull(dataConnector);
+ assertNotNull(dataConnector);
doTest(dataConnector);
}
@@ -180,25 +184,25 @@ public class RDBMSDataConnectorParserTest {
protected void doTest(final RDBMSDataConnector dataConnector) throws ResolutionException {
final String id = dataConnector.getId();
- Assert.assertEquals("myDatabase", id);
- Assert.assertEquals(Duration.ofMinutes(5), dataConnector.getNoRetryDelay());
+ assertEquals("myDatabase", id);
+ assertEquals(Duration.ofMinutes(5), dataConnector.getNoRetryDelay());
final BasicDataSource dataSource = (BasicDataSource) dataConnector.getDataSource();
- Assert.assertNotNull(dataSource);
- Assert.assertEquals(dataSource.getUrl(), "jdbc:hsqldb:mem:RDBMSDataConnectorStore");
- Assert.assertEquals(dataSource.getUsername(), "SA");
- Assert.assertEquals(dataSource.getMaxTotal(), 20);
- Assert.assertEquals(dataSource.getMaxIdle(), 5);
- Assert.assertEquals(dataSource.getMaxWaitMillis(), 5000);
-
- Assert.assertFalse(dataConnector.isConnectionReadOnly());
+ assertNotNull(dataSource);
+ assertEquals(dataSource.getUrl(), "jdbc:hsqldb:mem:RDBMSDataConnectorStore");
+ assertEquals(dataSource.getUsername(), "SA");
+ assertEquals(dataSource.getMaxTotal(), 20);
+ assertEquals(dataSource.getMaxIdle(), 5);
+ assertEquals(dataSource.getMaxWaitMillis(), 5000);
+
+ assertFalse(dataConnector.isConnectionReadOnly());
final DataSourceValidator validator = (DataSourceValidator) dataConnector.getValidator();
- Assert.assertNotNull(validator);
- Assert.assertTrue(validator.isThrowValidateError());
- Assert.assertNotNull(validator.getDataSource());
+ assertNotNull(validator);
+ assertTrue(validator.isThrowValidateError());
+ assertNotNull(validator.getDataSource());
final ExecutableSearchBuilder<ExecutableStatement> searchBuilder = dataConnector.getExecutableSearchBuilder();
- Assert.assertNotNull(searchBuilder);
+ assertNotNull(searchBuilder);
final StringResultMappingStrategy mappingStrategy = (StringResultMappingStrategy) dataConnector.getMappingStrategy();
AssertJUnit.assertNotNull(mappingStrategy);
@@ -206,6 +210,6 @@ public class RDBMSDataConnectorParserTest {
AssertJUnit.assertTrue(mappingStrategy.isMultipleResultsAnError());
final Cache<String, Map<String, IdPAttribute>> resultCache = dataConnector.getResultsCache();
- Assert.assertNotNull(resultCache);
+ assertNotNull(resultCache);
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
index b55982b..a0201e3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
@@ -17,16 +17,17 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
+import static org.testng.Assert.assertEquals;
+
import java.util.Collection;
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.AttributeEncoder;
import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
*
*/
@@ -41,7 +42,7 @@ public class Regressions extends BaseAttributeDefinitionParserTest {
Collection<AttributeEncoder> encoders = context.getBeansOfType(AttributeEncoder.class).values();
Collection<AttributeDefinition> definitions = context.getBeansOfType(AttributeDefinition.class).values();
- Assert.assertEquals(encoders.size(), 1);
- Assert.assertEquals(definitions.size(), 1);
+ assertEquals(encoders.size(), 1);
+ assertEquals(definitions.size(), 1);
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
index 87bbf08..4d0e03a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
+import static org.testng.Assert.assertEquals;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1Base64AttributeEncoderParser;
import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1ByteAttributeEncoder;
import net.shibboleth.idp.saml.xml.SAMLConstants;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for {@link SAML1Base64AttributeEncoderParser}.
*/
@@ -35,8 +36,8 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML1ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1Base64.xml", SAML1ByteAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "SAML1_BASE64_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_BASE64_ATTRIBUTE_NAME_SPACE");
+ assertEquals(encoder.getName(), "SAML1_BASE64_ATTRIBUTE_NAME");
+ assertEquals(encoder.getNamespace(),"SAML1_BASE64_ATTRIBUTE_NAME_SPACE");
}
@@ -44,11 +45,11 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML1ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1Base64Default.xml", SAML1ByteAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "Base64_ATTRIBUTE");
- Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
+ assertEquals(encoder.getName(), "Base64_ATTRIBUTE");
+ assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml1Base64NoName.xml", SAML1ByteAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
index 354bfa7..b31b7ed 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
+import static org.testng.Assert.assertEquals;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1ScopedStringAttributeEncoderParser;
import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1ScopedStringAttributeEncoder;
import net.shibboleth.idp.saml.xml.SAMLConstants;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for {@link SAML1ScopedStringAttributeEncoderParser}.
*/
@@ -35,11 +36,11 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
final SAML1ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1Scoped.xml", SAML1ScopedStringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "SAML1_SCOPED_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT");
- Assert.assertEquals(encoder.getScopeType(),"attribute");
- Assert.assertEquals(encoder.getScopeAttributeName(),"saml1ScopeAttrib");
- Assert.assertEquals(encoder.getScopeDelimiter(),"#@#");
+ assertEquals(encoder.getName(), "SAML1_SCOPED_ATTRIBUTE_NAME");
+ assertEquals(encoder.getNamespace(),"SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT");
+ assertEquals(encoder.getScopeType(),"attribute");
+ assertEquals(encoder.getScopeAttributeName(),"saml1ScopeAttrib");
+ assertEquals(encoder.getScopeDelimiter(),"#@#");
}
@@ -47,14 +48,14 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
final SAML1ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1ScopedDefault.xml", SAML1ScopedStringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "saml1_scoped_name");
- Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
- Assert.assertEquals(encoder.getScopeType(),"attribute");
- Assert.assertEquals(encoder.getScopeDelimiter(),"@");
- Assert.assertEquals(encoder.getScopeAttributeName(),"Scope");
+ assertEquals(encoder.getName(), "saml1_scoped_name");
+ assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
+ assertEquals(encoder.getScopeType(),"attribute");
+ assertEquals(encoder.getScopeDelimiter(),"@");
+ assertEquals(encoder.getScopeAttributeName(),"Scope");
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml1ScopedNoName.xml", SAML1ScopedStringAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
index 40c5ba0..9cd4a60 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
+import static org.testng.Assert.assertEquals;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1StringAttributeEncoderParser;
import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1StringAttributeEncoder;
import net.shibboleth.idp.saml.xml.SAMLConstants;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for {@link SAML1StringAttributeEncoderParser}.
*/
@@ -35,8 +36,8 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML1StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1String.xml", SAML1StringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "SAML1_STRING_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_STRING_ATTRIBUTE_NAME_SPACE");
+ assertEquals(encoder.getName(), "SAML1_STRING_ATTRIBUTE_NAME");
+ assertEquals(encoder.getNamespace(),"SAML1_STRING_ATTRIBUTE_NAME_SPACE");
}
@@ -44,11 +45,11 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML1StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1StringDefault.xml", SAML1StringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "ATTRIBUTE");
- Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
+ assertEquals(encoder.getName(), "ATTRIBUTE");
+ assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml1StringNoName.xml", SAML1StringAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
index e96afe1..ccda6b2 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
+import static org.testng.Assert.assertEquals;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1XMLObjectAttributeEncoderParser;
import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1XMLObjectAttributeEncoder;
import net.shibboleth.idp.saml.xml.SAMLConstants;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for {@link SAML1XMLObjectAttributeEncoderParser}.
*/
@@ -35,19 +36,19 @@ public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
final SAML1XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1XmlObject.xml", SAML1XMLObjectAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "SAML1_XMLObject_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_XMLObject_ATTRIBUTE_NAME_SPACE");
+ assertEquals(encoder.getName(), "SAML1_XMLObject_ATTRIBUTE_NAME");
+ assertEquals(encoder.getNamespace(),"SAML1_XMLObject_ATTRIBUTE_NAME_SPACE");
}
@Test public void defaultCase() {
final SAML1XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1XmlObjectDefault.xml", SAML1XMLObjectAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "XMLObject_ATTRIBUTE");
- Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
+ assertEquals(encoder.getName(), "XMLObject_ATTRIBUTE");
+ assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml1XmlObjectNoName.xml", SAML1XMLObjectAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
index f5a31c4..bef5195 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
@@ -17,15 +17,17 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2Base64AttributeEncoderParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2ByteAttributeEncoder;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
import org.opensaml.saml.saml2.core.Attribute;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2Base64AttributeEncoderParser;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2ByteAttributeEncoder;
+
/**
* Test for {@link SAML2Base64AttributeEncoderParser}.
*/
@@ -35,21 +37,21 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML2ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2Base64.xml", SAML2ByteAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "Saml2Base64_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2Base64_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2Base64_ATTRIBUTE_NAME_FORMAT");
+ assertEquals(encoder.getName(), "Saml2Base64_ATTRIBUTE_NAME");
+ assertEquals(encoder.getFriendlyName(),"Saml2Base64_ATTRIBUTE_FRIENDLY_NAME");
+ assertEquals(encoder.getNameFormat(),"Saml2Base64_ATTRIBUTE_NAME_FORMAT");
}
@Test public void defaultCase() {
final SAML2ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2Base64Default.xml", SAML2ByteAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "Base64Name");
- Assert.assertNull(encoder.getFriendlyName());
- Assert.assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
+ assertEquals(encoder.getName(), "Base64Name");
+ assertNull(encoder.getFriendlyName());
+ assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml2Base64NoName.xml", SAML2ByteAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
index ff79f93..0dcabfa 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
@@ -17,15 +17,17 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2ScopedStringAttributeEncoderParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2ScopedStringAttributeEncoder;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
import org.opensaml.saml.saml2.core.Attribute;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2ScopedStringAttributeEncoderParser;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2ScopedStringAttributeEncoder;
+
/**
* Test for {@link SAML2ScopedStringAttributeEncoderParser}.
*/
@@ -35,27 +37,27 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
final SAML2ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2Scoped.xml", SAML2ScopedStringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"ATTRIBUTE_NAME_FORMAT");
- Assert.assertEquals(encoder.getScopeType(),"attribute");
- Assert.assertEquals(encoder.getScopeAttributeName(),"scopeAttrib");
- Assert.assertEquals(encoder.getScopeDelimiter(),"###");
+ assertEquals(encoder.getName(), "ATTRIBUTE_NAME");
+ assertEquals(encoder.getFriendlyName(),"ATTRIBUTE_FRIENDLY_NAME");
+ assertEquals(encoder.getNameFormat(),"ATTRIBUTE_NAME_FORMAT");
+ assertEquals(encoder.getScopeType(),"attribute");
+ assertEquals(encoder.getScopeAttributeName(),"scopeAttrib");
+ assertEquals(encoder.getScopeDelimiter(),"###");
}
@Test public void defaultCase() {
final SAML2ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2ScopedDefault.xml", SAML2ScopedStringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "name");
- Assert.assertNull(encoder.getFriendlyName());
- Assert.assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
- Assert.assertEquals(encoder.getScopeType(),"inline");
- Assert.assertEquals(encoder.getScopeDelimiter(),"@");
- Assert.assertEquals(encoder.getScopeAttributeName(),"Scope");
+ assertEquals(encoder.getName(), "name");
+ assertNull(encoder.getFriendlyName());
+ assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
+ assertEquals(encoder.getScopeType(),"inline");
+ assertEquals(encoder.getScopeDelimiter(),"@");
+ assertEquals(encoder.getScopeAttributeName(),"Scope");
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml2ScopedNoName.xml", SAML2ScopedStringAttributeEncoder.class);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
index 5edc8ee..0961d4e 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
@@ -17,19 +17,24 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringAttributeEncoderParser;
-import net.shibboleth.idp.profile.logic.ScriptedPredicate;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringAttributeEncoder;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
import org.opensaml.saml.saml2.core.Attribute;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringAttributeEncoderParser;
+import net.shibboleth.idp.profile.logic.ScriptedPredicate;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringAttributeEncoder;
+
/**
* Test for {@link SAML2StringAttributeEncoderParser}.
*/
@@ -39,20 +44,20 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML2StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2String.xml", SAML2StringAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "Saml2String_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2String_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2String_ATTRIBUTE_NAME_FORMAT");
+ assertEquals(encoder.getName(), "Saml2String_ATTRIBUTE_NAME");
+ assertEquals(encoder.getFriendlyName(),"Saml2String_ATTRIBUTE_FRIENDLY_NAME");
+ assertEquals(encoder.getNameFormat(),"Saml2String_ATTRIBUTE_NAME_FORMAT");
}
@Test public void defaultCase() {
final SAML2StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2StringDefault.xml", SAML2StringAttributeEncoder.class);
- Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysTrue());
- Assert.assertTrue(encoder.getActivationCondition().test(null));
- Assert.assertEquals(encoder.getName(), "Saml2StringName");
- Assert.assertNull(encoder.getFriendlyName());
- Assert.assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
+ assertSame(encoder.getActivationCondition(), Predicates.alwaysTrue());
+ assertTrue(encoder.getActivationCondition().test(null));
+ assertEquals(encoder.getName(), "Saml2StringName");
+ assertNull(encoder.getFriendlyName());
+ assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
@@ -68,8 +73,8 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML2StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2StringConditional.xml", SAML2StringAttributeEncoder.class, context);
- Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysFalse());
- Assert.assertFalse(encoder.getActivationCondition().test(null));
+ assertSame(encoder.getActivationCondition(), Predicates.alwaysFalse());
+ assertFalse(encoder.getActivationCondition().test(null));
}
@Test public void conditionalScript() {
@@ -79,8 +84,8 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
final SAML2StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2String.xml", SAML2StringAttributeEncoder.class, context);
- Assert.assertTrue(encoder.getActivationCondition() instanceof ScriptedPredicate);
- Assert.assertFalse(encoder.getActivationCondition().test(null));
+ assertTrue(encoder.getActivationCondition() instanceof ScriptedPredicate);
+ assertFalse(encoder.getActivationCondition().test(null));
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
index 7dea7de..a74e957 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
@@ -17,15 +17,17 @@
package net.shibboleth.idp.attribute.resolver.spring.enc;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2XMLObjectAttributeEncoderParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2XMLObjectAttributeEncoder;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
import org.opensaml.saml.saml2.core.Attribute;
import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
+import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2XMLObjectAttributeEncoderParser;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2XMLObjectAttributeEncoder;
+
/**
* Test for {@link SAML2XMLObjectAttributeEncoderParser}.
*/
@@ -35,21 +37,21 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
final SAML2XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2XmlObject.xml", SAML2XMLObjectAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "Saml2XmlObject_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2XmlObject_ATTRIBUTE_NAME_FORMAT");
+ assertEquals(encoder.getName(), "Saml2XmlObject_ATTRIBUTE_NAME");
+ assertEquals(encoder.getFriendlyName(),"Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME");
+ assertEquals(encoder.getNameFormat(),"Saml2XmlObject_ATTRIBUTE_NAME_FORMAT");
}
@Test public void defaultCase() {
final SAML2XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2XmlObjectDefault.xml", SAML2XMLObjectAttributeEncoder.class);
- Assert.assertEquals(encoder.getName(), "XmlObjectName");
- Assert.assertNull(encoder.getFriendlyName());
- Assert.assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
+ assertEquals(encoder.getName(), "XmlObjectName");
+ assertNull(encoder.getFriendlyName());
+ assertEquals(encoder.getNameFormat(), Attribute.URI_REFERENCE);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
getAttributeEncoder("resolver/saml2XmlObjectNoName.xml", SAML2XMLObjectAttributeEncoder.class);
}
-}
\ 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