From 60bf4a9f764f8a0077a6100ebf8822c626b6cc99 Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Thu, 25 Aug 2016 11:51:19 -0700
Subject: [PATCH] s1965 - reversed exception catching order
---
.../nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
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 b040578d..7c14a87e 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);
}
--
GitLab