summaryrefslogtreecommitdiffstats
path: root/datarouter-prov/src/test/java
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@ericsson.com>2018-08-07 22:19:13 +0100
committerFiachra Corcoran <fiachra.corcoran@ericsson.com>2018-08-08 16:19:48 +0100
commitbce219cdadbad724b1c6b2704695d8adf11eb65d (patch)
tree6766104b1f178e3ad5bbf643f7cab3a0201c61ea /datarouter-prov/src/test/java
parentdcb5aef184cc0e6a68fc65a4bf0fbc4e48968bad (diff)
DB utils update for db initialization
Issue-ID: DMAAP-566 Change-Id: I3dad4059a3b192f2c54598985893b1334809d1f0 Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
Diffstat (limited to 'datarouter-prov/src/test/java')
-rw-r--r--datarouter-prov/src/test/java/datarouter/provisioning/testBase.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java
index d124af43..dd8e86cc 100644
--- a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java
@@ -32,6 +32,7 @@ import java.io.InputStream;
import java.security.KeyStore;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
@@ -49,7 +50,7 @@ import org.onap.dmaap.datarouter.provisioning.FeedServlet;
public class testBase {
/** The properties file to read the DB properties from */
- public static final String CONFIG_FILE = "tests.properties";
+ public static final String CONFIG_FILE = "integration_test.properties";
public Properties props;
protected AbstractHttpClient httpclient;
@@ -145,6 +146,7 @@ public class testBase {
// shut down the connection manager to ensure
// immediate deallocation of all system resources
httpclient.getConnectionManager().shutdown();
+ FileUtils.deleteDirectory(new File("./unit-test-logs"));
}
protected void ckResponse(HttpResponse response, int expect) {