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 b040578d6574d613d4a30b769a181965051bc446..7c14a87ec444a249c7dda57a5bddb452e03ee9e0 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 @@ -137,19 +137,18 @@ public class AbstractLdapDAOTest { config = getLdapConfig(); } - catch (RuntimeException e) + catch (NoSuchElementException e) { - log.warn("Skipping integration test: no ~/.dbrc file"); + log.warn("Skipping integration test: no entry in ~/.dbrc file"); org.junit.Assume.assumeTrue(false); return; } - catch (NoSuchElementException e) + catch (RuntimeException e) { - log.warn("Skipping integration test: no entry in ~/.dbrc file"); + log.warn("Skipping integration test: no ~/.dbrc file"); org.junit.Assume.assumeTrue(false); return; } - cadcDaoTest1_HttpPrincipal = new HttpPrincipal(cadcDaoTest1_CN); cadcDaoTest2_HttpPrincipal = new HttpPrincipal(cadcDaoTest2_CN); cadcDaoTest3_HttpPrincipal = new HttpPrincipal(cadcDaoTest3_CN); @@ -239,7 +238,7 @@ public class AbstractLdapDAOTest return new LdapUserDAO(connections); } - static protected LdapConfig getLdapConfig() + static protected LdapConfig getLdapConfig() throws Exception { return LdapConfig.loadLdapConfig(CONFIG); }