[java-identity-provider] branch master updated: Add duration converter to failing tests.
Scott Cantor
cantor.2 at osu.edu
Fri Mar 8 14:38:30 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor 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=b3796a60e1b3183a7cec1f718a4c17699c7a988b
The following commit(s) were added to refs/heads/master by this push:
new b3796a6 Add duration converter to failing tests.
b3796a6 is described below
commit b3796a60e1b3183a7cec1f718a4c17699c7a988b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Mar 8 14:38:27 2019 -0500
Add duration converter to failing tests.
---
.../idp/attribute/resolver/spring/AttributeMapperTest.java | 12 ++++++++++++
.../resolver/spring/AttributeMappingNodeProcessorTest.java | 11 +++++++++++
.../idp/attribute/resolver/spring/AttributeResolverTest.java | 11 +++++++++++
.../relyingparty/metadata/InlineMetadataParserTest.java | 6 +++++-
4 files changed, 39 insertions(+), 1 deletion(-)
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 d00ae7c..a324189 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,8 +17,11 @@
package net.shibboleth.idp.attribute.resolver.spring;
+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.IdPRequestedAttribute;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
@@ -37,6 +40,7 @@ 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;
@@ -67,6 +71,14 @@ public class AttributeMapperTest extends OpenSAMLInitBaseTestCase {
setTestContext(context);
context.setDisplayName("ApplicationContext: " + AttributeMapperTest.class);
+ final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
+ context.setDisplayName("ApplicationContext: ");
+ service.setConverters(new HashSet<>(Arrays.asList(
+ new StringToDurationConverter())));
+ service.afterPropertiesSet();
+
+ context.getBeanFactory().setConversionService(service.getObject());
+
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
new SchemaTypeAwareXMLBeanDefinitionReader(context);
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 5f3aac1..3eb3e3e 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,8 +17,11 @@
package net.shibboleth.idp.attribute.resolver.spring;
+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;
@@ -32,6 +35,7 @@ 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;
@@ -79,6 +83,13 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
setTestContext(context);
context.setDisplayName("ApplicationContext: ");
+ final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
+ context.setDisplayName("ApplicationContext: ");
+ service.setConverters(new HashSet<>(Arrays.asList(new StringToDurationConverter())));
+ service.afterPropertiesSet();
+
+ context.getBeanFactory().setConversionService(service.getObject());
+
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
new SchemaTypeAwareXMLBeanDefinitionReader(context);
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 d44ed6a..55cb990 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,8 @@
package net.shibboleth.idp.attribute.resolver.spring;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -32,6 +34,7 @@ import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.impl.NameIDBuilder;
import org.slf4j.Logger;
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;
@@ -46,6 +49,7 @@ import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
+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.IdPAttributeValue;
@@ -132,6 +136,13 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
setTestContext(context);
context.setDisplayName("ApplicationContext: " + AttributeResolverTest.class);
+ final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
+ context.setDisplayName("ApplicationContext: ");
+ service.setConverters(new HashSet<>(Arrays.asList(new StringToDurationConverter())));
+ service.afterPropertiesSet();
+
+ context.getBeanFactory().setConversionService(service.getObject());
+
final SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
new SchemaTypeAwareXMLBeanDefinitionReader(context);
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
index 492e8dd..1b5e6b6 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Iterator;
import net.shibboleth.ext.spring.config.DurationToLongConverter;
+import net.shibboleth.ext.spring.config.StringToDurationConverter;
import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.ext.spring.service.ReloadableSpringService;
@@ -84,7 +85,10 @@ public class InlineMetadataParserTest extends AbstractMetadataParserTest {
final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
context.setDisplayName("ApplicationContext: ");
- service.setConverters(new HashSet<>(Arrays.asList(new DurationToLongConverter(), new StringToIPRangeConverter())));
+ service.setConverters(new HashSet<>(Arrays.asList(
+ new DurationToLongConverter(),
+ new StringToIPRangeConverter(),
+ new StringToDurationConverter())));
service.afterPropertiesSet();
context.getBeanFactory().setConversionService(service.getObject());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list