diff --git a/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java index 2f16b210efcb28a37f290d9bb6621cc6b35d906e..b040578d6574d613d4a30b769a181965051bc446 100644 --- a/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java +++ b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java @@ -83,7 +83,6 @@ import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; import java.lang.reflect.Field; import java.util.UUID; -import java.io.FileNotFoundException; import java.util.NoSuchElementException; /** @@ -138,7 +137,7 @@ public class AbstractLdapDAOTest { config = getLdapConfig(); } - catch (FileNotFoundException e) + catch (RuntimeException e) { log.warn("Skipping integration test: no ~/.dbrc file"); org.junit.Assume.assumeTrue(false); @@ -240,7 +239,7 @@ public class AbstractLdapDAOTest return new LdapUserDAO(connections); } - static protected LdapConfig getLdapConfig() throws Exception + static protected LdapConfig getLdapConfig() { return LdapConfig.loadLdapConfig(CONFIG); }