From 307c3edfc07c548b1cfc750e7e60e08ac301165b Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Thu, 25 Aug 2016 11:34:31 -0700
Subject: [PATCH] s1965
---
.../ac/server/ldap/AbstractLdapDAOTest.java | 24 +++++++++++++++++--
.../nrc/cadc/ac/server/ldap/LdapDAOTest.java | 0
.../cadc/ac/server/ldap/LdapDAOTestImpl.java | 0
.../cadc/ac/server/ldap/LdapGroupDAOTest.java | 0
.../cadc/ac/server/ldap/LdapUserDAOTest.java | 0
5 files changed, 22 insertions(+), 2 deletions(-)
rename cadc-access-control-server/src/{integration => test}/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java (93%)
rename cadc-access-control-server/src/{integration => test}/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java (100%)
rename cadc-access-control-server/src/{integration => test}/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java (100%)
rename cadc-access-control-server/src/{integration => test}/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java (100%)
rename cadc-access-control-server/src/{integration => test}/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java (100%)
diff --git a/cadc-access-control-server/src/integration/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
similarity index 93%
rename from cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
index 0a7fb415..2f16b210 100644
--- a/cadc-access-control-server/src/integration/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
@@ -76,18 +76,23 @@ import ca.nrc.cadc.auth.HttpPrincipal;
import ca.nrc.cadc.auth.NumericPrincipal;
import ca.nrc.cadc.util.Log4jInit;
import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.junit.BeforeClass;
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;
/**
* Created by jburke on 2014-11-03.
*/
public class AbstractLdapDAOTest
{
+ private static final Logger log = Logger.getLogger(AbstractLdapDAOTest.class);
+
static final String CONFIG = LdapConfig.class.getSimpleName() + ".test.properties";
protected static final String SERVOPS_PEM = System.getProperty("user.home") + "/.pub/proxy.pem";
@@ -129,7 +134,22 @@ public class AbstractLdapDAOTest
Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);
// get the configuration of the development server from and config files...
- config = getLdapConfig();
+ try
+ {
+ config = getLdapConfig();
+ }
+ catch (FileNotFoundException e)
+ {
+ log.warn("Skipping integration test: no ~/.dbrc file");
+ org.junit.Assume.assumeTrue(false);
+ return;
+ }
+ catch (NoSuchElementException e)
+ {
+ log.warn("Skipping integration test: no entry in ~/.dbrc file");
+ org.junit.Assume.assumeTrue(false);
+ return;
+ }
cadcDaoTest1_HttpPrincipal = new HttpPrincipal(cadcDaoTest1_CN);
cadcDaoTest2_HttpPrincipal = new HttpPrincipal(cadcDaoTest2_CN);
@@ -220,7 +240,7 @@ public class AbstractLdapDAOTest
return new LdapUserDAO(connections);
}
- static protected LdapConfig getLdapConfig()
+ static protected LdapConfig getLdapConfig() throws Exception
{
return LdapConfig.loadLdapConfig(CONFIG);
}
diff --git a/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
similarity index 100%
rename from cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
diff --git a/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
similarity index 100%
rename from cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
diff --git a/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
similarity index 100%
rename from cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
diff --git a/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
similarity index 100%
rename from cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
--
GitLab