diff options
Diffstat (limited to 'java/systests/src')
4 files changed, 15 insertions, 15 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 c39c3a0add..d7932dae78 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 @@ -113,7 +113,7 @@ public class AlertingTest extends AbstractTestLogging message.append("\nVirtualhost maxMessageCount:\n"); ServerConfiguration config = new ServerConfiguration(_configFile); - config.configure();; + config.initialise(); 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 533fc94aeb..13b0b7dda1 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,7 +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(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); // Make them all persistent i.e. Use DerbyMessageStore and @@ -100,7 +100,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); //Validate each vhost logs a creation @@ -164,7 +164,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); //Validate each vhost logs a creation @@ -232,7 +232,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); //Validate each vhost logs a creation @@ -299,7 +299,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); //Validate each vhost logs a creation @@ -365,7 +365,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name"); //Validate each vhost logs a creation @@ -508,7 +508,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); 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 0eccf6e5ac..294838201f 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 @@ -88,14 +88,14 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging //1 assertEquals("MST-1001 is not the first MST message", "MST-1001", getMessageID(fromMessage(log))); + //Validate each vhost logs a creation + results = _monitor.waitAndFindMatches("MST-1001", DEFAULT_LOG_WAIT); + // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = Arrays.asList(configuration.getVirtualHosts()); - //Validate each vhost logs a creation - results = _monitor.waitAndFindMatches("MST-1001", DEFAULT_LOG_WAIT); - assertEquals("Each vhost did not create a store.", vhosts.size(), results.size()); for (int index = 0; index < results.size(); index++) @@ -155,7 +155,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); 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 6631f6bbbd..a82e0c7496 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,7 +70,7 @@ public class VirtualHostLoggingTest extends AbstractTestLogging { // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = Arrays.asList(configuration.getVirtualHosts()); assertEquals("Each vhost did not create a store.", vhosts.size(), results.size()); @@ -124,7 +124,7 @@ public class VirtualHostLoggingTest extends AbstractTestLogging { // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); - configuration.configure(); + configuration.initialise(); List<String> vhosts = Arrays.asList(configuration.getVirtualHosts()); assertEquals("Each vhost did not close their store.", vhosts.size(), results.size()); |