[java-identity-provider] branch master updated: Add converter to failing tests.

[Scott Cantor]

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=d12c056a85ef5a15b9308b0477288dfe1f36dbec

The following commit(s) were added to refs/heads/master by this push:
       new  d12c056   Add converter to failing tests.
d12c056 is described below

commit d12c056a85ef5a15b9308b0477288dfe1f36dbec
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 14 12:50:03 2019 -0400

    Add converter to failing tests.
---
 .../resolver/spring/BaseAttributeDefinitionParserTest.java    |  8 ++++++--
 .../resolver/spring/dc/StoredIdDataConnectorParserTest.java   | 11 ++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

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 13cd3c4..bfa34dc 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
@@ -23,6 +23,7 @@ import java.util.HashSet;
 
 import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
+import net.shibboleth.ext.spring.config.StringToDurationConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.ext.spring.config.StringToResourceConverter;
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
@@ -96,8 +97,11 @@ public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBase
             final boolean supressValid) {
 
         final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
-        service.setConverters(new HashSet<>(Arrays.asList(new DurationToLongConverter(), new StringToIPRangeConverter(),
-                new StringToResourceConverter())));
+        service.setConverters(new HashSet<>(Arrays.asList(
+                new DurationToLongConverter(),
+                new StringToIPRangeConverter(),
+                new StringToResourceConverter(),
+                new StringToDurationConverter())));
         service.afterPropertiesSet();
 
         context.getBeanFactory().setConversionService(service.getObject());
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 c3a5089..e3fabb6 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
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.attribute.resolver.spring.dc;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
 
@@ -27,6 +28,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 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.config.StringToResourceConverter;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
@@ -51,7 +53,7 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
         Assert.assertEquals(connector.getId(), "stored");
         Assert.assertEquals(connector.getGeneratedAttributeId(), "jenny");
         Assert.assertEquals(store.getTransactionRetries(), 5);
-        Assert.assertEquals(store.getQueryTimeout(), 5000);
+        Assert.assertEquals(store.getQueryTimeout(), Duration.ofSeconds(5));
         Assert.assertEquals(store.getVerifyDatabase(), false);
         Assert.assertTrue(Arrays.equals(store.getRetryableErrors().toArray(), new String[]{"25000", "25001"}));
         
@@ -75,8 +77,11 @@ public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionPars
         context.setDisplayName("ApplicationContext: " + RDBMSDataConnectorParserTest.class);
 
         final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
-        service.setConverters(new HashSet<>(Arrays.asList(new DurationToLongConverter(), new StringToIPRangeConverter(),
-                new StringToResourceConverter())));
+        service.setConverters(new HashSet<>(Arrays.asList(
+                new DurationToLongConverter(),
+                new StringToIPRangeConverter(),
+                new StringToResourceConverter(),
+                new StringToDurationConverter())));
         service.afterPropertiesSet();
 
         context.getBeanFactory().setConversionService(service.getObject());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.