summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-04-02 15:23:26 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-04-02 15:23:26 +0200
commit2be61d2c2db7c52077978a6bdbf71828d5e2e0e2 (patch)
tree1eab08a9d3587781ed78375ace9f0027314c26a4
parent105351949f127a4f936391f5ac8ae93bea707a35 (diff)
Reuse single config file for testing
-rw-r--r--src/test/java/MainTest.java2
-rw-r--r--src/test/resources/properties.conf1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java
index b0a179a..1ccc7e9 100644
--- a/src/test/java/MainTest.java
+++ b/src/test/java/MainTest.java
@@ -25,7 +25,7 @@ public class MainTest {
public MainTest() throws Exception {
Logger.addLogStream(System.out, 1);
- Properties props = FileStringUtility.loadConfigFile(MainTest.class.getResource("properties.conf").getPath());
+ Properties props = FileStringUtility.loadConfigFile(MainTest.class.getResource("server.conf").getPath());
Gateway.init(props);
XMLUnit.setIgnoreWhitespace(true);
XMLUnit.setIgnoreComments(true);
diff --git a/src/test/resources/properties.conf b/src/test/resources/properties.conf
deleted file mode 100644
index 476aeb0..0000000
--- a/src/test/resources/properties.conf
+++ /dev/null
@@ -1 +0,0 @@
-ClusterStorage=MemoryOnlyClusterStorage \ No newline at end of file