From 8d2419fd32667ba245d03be5f5e3584f4692628b Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Thu, 25 Aug 2016 11:46:07 -0700
Subject: [PATCH] s1965 - corrected 'no ldap config' exception catching
---
.../java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 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 2f16b210..b040578d 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);
}
--
GitLab