QPID-2583 : Update tests to correctly throw ConfigurationException where requried and to correctly configure configuration

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@942105 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 15 insertions, 2 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
index a4b47268e2..c39c3a0add 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
@@ -111,8 +111,10 @@ public class AlertingTest extends AbstractTestLogging
             message.append("Server configuration overrides in use:\n");
             message.append(FileUtils.readFileAsString(getTestConfigFile()));
 
-            message.append("\nVirtualhost maxMessageCount:\n");                        
-            message.append(new ServerConfiguration(_configFile).getVirtualHostConfig(VIRTUALHOST).getMaximumMessageCount());
+            message.append("\nVirtualhost maxMessageCount:\n");
+            ServerConfiguration config = new ServerConfiguration(_configFile);
+            config.configure();;
+            message.append(config.getVirtualHostConfig(VIRTUALHOST).getMaximumMessageCount());
 
             fail(message.toString());
         }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
index 5b2fc4cdcb..533fc94aeb 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
@@ -59,6 +59,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load the default configuration file to get the list of defined vhosts
         ServerConfiguration configuration = new ServerConfiguration(new File(_configFile.getParent() + "/config.xml"));
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         // Make them all persistent i.e. Use DerbyMessageStore and
@@ -99,6 +100,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
@@ -162,6 +164,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
@@ -229,6 +232,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
@@ -295,6 +299,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
@@ -360,6 +365,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
@@ -502,6 +508,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
 
             // Load VirtualHost list from file.
             ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            configuration.configure();
             List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
             //Validate each vhost logs a creation
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
index c3c2574519..0eccf6e5ac 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
@@ -90,6 +90,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = Arrays.asList(configuration.getVirtualHosts());
 
         //Validate each vhost logs a creation
@@ -154,6 +155,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
 
         // Load VirtualHost list from file.
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        configuration.configure();
         List<String> vhosts = Arrays.asList(configuration.getVirtualHosts());
 
         //Validate each vhost logs a creation
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
index d4c3689365..6631f6bbbd 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
@@ -70,6 +70,7 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
         {
             // Load VirtualHost list from file. 
             ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            configuration.configure();
             List<String> vhosts = Arrays.asList(configuration.getVirtualHosts());
 
             assertEquals("Each vhost did not create a store.", vhosts.size(), results.size());
@@ -123,6 +124,7 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
         {
             // Load VirtualHost list from file. 
             ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            configuration.configure();
             List<String> vhosts = Arrays.asList(configuration.getVirtualHosts());
 
             assertEquals("Each vhost did not close their store.", vhosts.size(), results.size());