[java-identity-provider] branch master updated: IDP-1181 Fix tests for new FailFast behavior

[Rod Widdowson]

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=4696a72e08b1053c100783f9cfc1da52d37c8338

The following commit(s) were added to refs/heads/master by this push:
       new  4696a72   IDP-1181 Fix tests for new FailFast behavior
4696a72 is described below

commit 4696a72e08b1053c100783f9cfc1da52d37c8338
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 13 11:14:15 2019 +0100

    IDP-1181 Fix tests for new FailFast behavior
    
    https://issues.shibboleth.net/jira/browse/IDP-1181
---
 .../idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java  | 6 +++---
 .../attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index 2fdd43f..d1b22b3 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -145,6 +145,7 @@ public class LDAPDataConnectorTest {
         } catch (final ComponentInitializationException e) {
             // OK
         }
+        connector.setFailFast(true);
 
         final SearchExecutor searchExecutor = new SearchExecutor();
         searchExecutor.setBaseDn(TEST_BASE_DN);
@@ -201,6 +202,7 @@ public class LDAPDataConnectorTest {
         connector.setConnectionFactory(connectionFactory);
         connector.setSearchExecutor(new SearchExecutor());
         connector.setExecutableSearchBuilder(newParameterizedExecutableSearchFilterBuilder("(uid={principalName})"));
+        connector.setFailFast(true);
 
         try {
             connector.initialize();
@@ -209,7 +211,7 @@ public class LDAPDataConnectorTest {
             // OK
         }
 
-        connector.setValidator(newConnectionFactoryValidator(connectionFactory, false));
+        connector.setFailFast(false);
         connector.initialize();
     }
 
@@ -564,14 +566,12 @@ public class LDAPDataConnectorTest {
         
         validator.setConnectionFactory(connectionFactory);
         validator.setThrowValidateError(throwValidateError);
-        validator.initialize();
         return validator;
     }
 
     public static ConnectionFactoryValidator newConnectionFactoryValidator(final ConnectionFactory connectionFactory) throws ComponentInitializationException {
         final ConnectionFactoryValidator validator = new ConnectionFactoryValidator();
         validator.setConnectionFactory(connectionFactory);
-        validator.initialize();
         return validator;
     }
 }
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index b2ff70e..ae09f3b 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -140,6 +140,7 @@ public class RDBMSDataConnectorTest {
 
         final ExecutableSearchBuilder<ExecutableStatement> statementBuilder = newFormatExecutableStatementBuilder(USER_QUERY);
         connector.setExecutableSearchBuilder(statementBuilder);
+        connector.setFailFast(true);
         try {
             connector.initialize();
             fail("Invalid datasource");
@@ -177,7 +178,7 @@ public class RDBMSDataConnectorTest {
         final ExecutableSearchBuilder<ExecutableStatement> statementBuilder = newFormatExecutableStatementBuilder(USER_QUERY);
         connector.setExecutableSearchBuilder(statementBuilder);
         connector.setDataSource(new JDBCDataSource());
-
+        connector.setFailFast(true);
         try {
             connector.initialize();
             fail("No failfast");

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