diff options
Diffstat (limited to 'java/broker/src/test')
11 files changed, 58 insertions, 59 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java index 9663ea4539..7a8cabf512 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java @@ -118,7 +118,7 @@ public class LogMessageTest extends TestCase * Inner class used by testSimultaneousLogging. * * This class creates a given number of LogMessages using the BrokerMessages package. - * BRK_CONFIG and BRK_LISTENING messages are both created per count. + * CONFIG and LISTENING messages are both created per count. * * This class is run multiple times simultaneously so that we increase the chance of * reproducing QPID-2137. This is reproduced when the pattern string used in the MessageFormat @@ -145,8 +145,8 @@ public class LogMessageTest extends TestCase // try and generate _count iterations of Config & Listening messages. for (int i = 0; i < _count; i++) { - BrokerMessages.BRK_CONFIG("Config"); - BrokerMessages.BRK_LISTENING("TCP", 1234); + BrokerMessages.CONFIG("Config"); + BrokerMessages.LISTENING("TCP", 1234); } } catch (Exception e) diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java index 7a750baf06..22de8349c6 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java @@ -30,7 +30,7 @@ public class BindingMessagesTest extends AbstractTestMessages public void testBindCreate_NoArgs() { - _logMessage = BindingMessages.BND_CREATED(null, false); + _logMessage = BindingMessages.CREATED(null, false); List<Object> log = performLog(); String[] expected = {"Create"}; @@ -42,7 +42,7 @@ public class BindingMessagesTest extends AbstractTestMessages { String arguments = "arguments"; - _logMessage = BindingMessages.BND_CREATED(arguments, true); + _logMessage = BindingMessages.CREATED(arguments, true); List<Object> log = performLog(); String[] expected = {"Create", ": Arguments :", arguments}; @@ -52,7 +52,7 @@ public class BindingMessagesTest extends AbstractTestMessages public void testBindDelete() { - _logMessage = BindingMessages.BND_DELETED(); + _logMessage = BindingMessages.DELETED(); List<Object> log = performLog(); diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java index 17306b2e2a..a3d46f5716 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java @@ -32,7 +32,7 @@ public class BrokerMessagesTest extends AbstractTestMessages String version = "Qpid 0.6"; String build = "796936M"; - _logMessage = BrokerMessages.BRK_STARTUP(version, build); + _logMessage = BrokerMessages.STARTUP(version, build); List<Object> log = performLog(); String[] expected = {"Startup :", "Version:", version, "Build:", build}; @@ -45,7 +45,7 @@ public class BrokerMessagesTest extends AbstractTestMessages String transport = "TCP"; Integer port = 2765; - _logMessage = BrokerMessages.BRK_LISTENING(transport, port); + _logMessage = BrokerMessages.LISTENING(transport, port); List<Object> log = performLog(); @@ -60,7 +60,7 @@ public class BrokerMessagesTest extends AbstractTestMessages String transport = "TCP"; Integer port = 2765; - _logMessage = BrokerMessages.BRK_SHUTTING_DOWN(transport, port); + _logMessage = BrokerMessages.SHUTTING_DOWN(transport, port); List<Object> log = performLog(); @@ -71,7 +71,7 @@ public class BrokerMessagesTest extends AbstractTestMessages public void testBrokerReady() { - _logMessage = BrokerMessages.BRK_READY(); + _logMessage = BrokerMessages.READY(); List<Object> log = performLog(); String[] expected = {"Ready"}; @@ -81,7 +81,7 @@ public class BrokerMessagesTest extends AbstractTestMessages public void testBrokerStopped() { - _logMessage = BrokerMessages.BRK_STOPPED(); + _logMessage = BrokerMessages.STOPPED(); List<Object> log = performLog(); String[] expected = {"Stopped"}; @@ -93,7 +93,7 @@ public class BrokerMessagesTest extends AbstractTestMessages { String path = "/file/path/to/configuration.xml"; - _logMessage = BrokerMessages.BRK_CONFIG(path); + _logMessage = BrokerMessages.CONFIG(path); List<Object> log = performLog(); String[] expected = {"Using configuration :", path}; @@ -105,7 +105,7 @@ public class BrokerMessagesTest extends AbstractTestMessages { String path = "/file/path/to/configuration.xml"; - _logMessage = BrokerMessages.BRK_LOG_CONFIG(path); + _logMessage = BrokerMessages.LOG_CONFIG(path); List<Object> log = performLog(); String[] expected = {"Using logging configuration :", path}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java index 2d414e9e95..e94b79ba95 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java @@ -29,7 +29,7 @@ public class ChannelMessagesTest extends AbstractTestMessages { public void testChannelCreate() { - _logMessage = ChannelMessages.CHN_CREATE(); + _logMessage = ChannelMessages.CREATE(); List<Object> log = performLog(); // We use the MessageFormat here as that is what the ChannelMessage @@ -43,7 +43,7 @@ public class ChannelMessagesTest extends AbstractTestMessages { String flow = "ON"; - _logMessage = ChannelMessages.CHN_FLOW(flow); + _logMessage = ChannelMessages.FLOW(flow); List<Object> log = performLog(); String[] expected = {"Flow", flow}; @@ -53,7 +53,7 @@ public class ChannelMessagesTest extends AbstractTestMessages public void testChannelClose() { - _logMessage = ChannelMessages.CHN_CLOSE(); + _logMessage = ChannelMessages.CLOSE(); List<Object> log = performLog(); String[] expected = {"Close"}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java index 6003cafc95..24fccf8446 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java @@ -32,7 +32,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages String clientID = "client"; String protocolVersion = "8-0"; - _logMessage = ConnectionMessages.CON_OPEN(clientID, protocolVersion, true , true); + _logMessage = ConnectionMessages.OPEN(clientID, protocolVersion, true , true); List<Object> log = performLog(); String[] expected = {"Open :", "Client ID", clientID, @@ -45,7 +45,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages { String clientID = "client"; - _logMessage = ConnectionMessages.CON_OPEN(clientID, null,true, false); + _logMessage = ConnectionMessages.OPEN(clientID, null,true, false); List<Object> log = performLog(); String[] expected = {"Open :", "Client ID", clientID}; @@ -57,7 +57,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages { String protocolVersion = "8-0"; - _logMessage = ConnectionMessages.CON_OPEN(null, protocolVersion, false , true); + _logMessage = ConnectionMessages.OPEN(null, protocolVersion, false , true); List<Object> log = performLog(); String[] expected = {"Open", ": Protocol Version :", protocolVersion}; @@ -67,7 +67,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages public void testConnectionOpen_WithNoClientIDNoProtocolVersion() { - _logMessage = ConnectionMessages.CON_OPEN(null, null,false, false); + _logMessage = ConnectionMessages.OPEN(null, null,false, false); List<Object> log = performLog(); String[] expected = {"Open"}; @@ -79,7 +79,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages public void testConnectionClose() { - _logMessage = ConnectionMessages.CON_CLOSE(); + _logMessage = ConnectionMessages.CLOSE(); List<Object> log = performLog(); String[] expected = {"Close"}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java index 174576b473..728a98e009 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java @@ -40,7 +40,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages String type = exchange.getTypeShortString().toString(); String name = exchange.getNameShortString().toString(); - _logMessage = ExchangeMessages.EXH_CREATED(type, name, false); + _logMessage = ExchangeMessages.CREATED(type, name, false); List<Object> log = performLog(); String[] expected = {"Create :", "Type:", type, "Name:", name}; @@ -58,7 +58,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages String type = exchange.getTypeShortString().toString(); String name = exchange.getNameShortString().toString(); - _logMessage = ExchangeMessages.EXH_CREATED(type, name, true); + _logMessage = ExchangeMessages.CREATED(type, name, true); List<Object> log = performLog(); String[] expected = {"Create :", "Durable", "Type:", type, "Name:", name}; @@ -69,7 +69,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages public void testExchangeDeleted() { - _logMessage = ExchangeMessages.EXH_DELETED(); + _logMessage = ExchangeMessages.DELETED(); List<Object> log = performLog(); String[] expected = {"Deleted"}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java index 9b1ab2c14d..ce0e9bb232 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java @@ -29,7 +29,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages { public void testManagementStartup() { - _logMessage = ManagementConsoleMessages.MNG_STARTUP(); + _logMessage = ManagementConsoleMessages.STARTUP(); List<Object> log = performLog(); String[] expected = {"Startup"}; @@ -42,7 +42,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages String transport = "JMX"; Integer port = 8889; - _logMessage = ManagementConsoleMessages.MNG_LISTENING(transport, port); + _logMessage = ManagementConsoleMessages.LISTENING(transport, port); List<Object> log = performLog(); String[] expected = {"Starting :", transport, ": Listening on port", String.valueOf(port)}; @@ -55,7 +55,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages String transport = "JMX"; Integer port = 8889; - _logMessage = ManagementConsoleMessages.MNG_SHUTTING_DOWN(transport, port); + _logMessage = ManagementConsoleMessages.SHUTTING_DOWN(transport, port); List<Object> log = performLog(); String[] expected = {"Shuting down :", transport, ": port", String.valueOf(port)}; @@ -65,7 +65,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages public void testManagementReady() { - _logMessage = ManagementConsoleMessages.MNG_READY(); + _logMessage = ManagementConsoleMessages.READY(); List<Object> log = performLog(); String[] expected = {"Ready"}; @@ -75,7 +75,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages public void testManagementStopped() { - _logMessage = ManagementConsoleMessages.MNG_STOPPED(); + _logMessage = ManagementConsoleMessages.STOPPED(); List<Object> log = performLog(); String[] expected = {"Stopped"}; @@ -87,7 +87,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages { String path = "/path/to/the/keystore/files.jks"; - _logMessage = ManagementConsoleMessages.MNG_SSL_KEYSTORE(path); + _logMessage = ManagementConsoleMessages.SSL_KEYSTORE(path); List<Object> log = performLog(); String[] expected = {"Using SSL Keystore :", path}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java index 21041fc611..cc032a0430 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.logging.messages; -import java.text.MessageFormat; import java.util.List; /** @@ -32,7 +31,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages { String name = "DerbyMessageStore"; - _logMessage = MessageStoreMessages.MST_CREATED(name); + _logMessage = MessageStoreMessages.CREATED(name); List<Object> log = performLog(); String[] expected = {"Created :", name}; @@ -44,7 +43,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages { String location = "/path/to/the/message/store.files"; - _logMessage = MessageStoreMessages.MST_STORE_LOCATION(location); + _logMessage = MessageStoreMessages.STORE_LOCATION(location); List<Object> log = performLog(); String[] expected = {"Store location :", location}; @@ -54,7 +53,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages public void testMessageStoreClosed() { - _logMessage = MessageStoreMessages.MST_CLOSED(); + _logMessage = MessageStoreMessages.CLOSED(); List<Object> log = performLog(); String[] expected = {"Closed"}; @@ -64,7 +63,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages public void testMessageStoreRecoveryStart() { - _logMessage = MessageStoreMessages.MST_RECOVERY_START(); + _logMessage = MessageStoreMessages.RECOVERY_START(); List<Object> log = performLog(); String[] expected = {"Recovery Start"}; @@ -76,7 +75,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages { String queueName = "testQueue"; - _logMessage = MessageStoreMessages.MST_RECOVERY_START(queueName, true); + _logMessage = MessageStoreMessages.RECOVERY_START(queueName, true); List<Object> log = performLog(); String[] expected = {"Recovery Start :", queueName}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java index 417ae31d13..d51e6a6bb7 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java @@ -32,7 +32,7 @@ public class QueueMessagesTest extends AbstractTestMessages String owner = "guest"; Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, true, true); + _logMessage = QueueMessages.CREATED(owner, priority, true, true, true, true, true); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -46,7 +46,7 @@ public class QueueMessagesTest extends AbstractTestMessages { String owner = "guest"; - _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, false, false); + _logMessage = QueueMessages.CREATED(owner, null, true, true, false, false, false); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete"}; @@ -59,7 +59,7 @@ public class QueueMessagesTest extends AbstractTestMessages String owner = "guest"; Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, false, false, false, true); + _logMessage = QueueMessages.CREATED(owner, priority, true, false, false, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "Priority:", @@ -73,7 +73,7 @@ public class QueueMessagesTest extends AbstractTestMessages String owner = "guest"; Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, false, true); + _logMessage = QueueMessages.CREATED(owner, priority, true, true, false, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -87,7 +87,7 @@ public class QueueMessagesTest extends AbstractTestMessages { String owner = "guest"; - _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, true, false); + _logMessage = QueueMessages.CREATED(owner, null, true, true, false, true, false); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -101,7 +101,7 @@ public class QueueMessagesTest extends AbstractTestMessages String owner = "guest"; Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, true, true); + _logMessage = QueueMessages.CREATED(owner, priority, true, true, false, true, true); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -115,7 +115,7 @@ public class QueueMessagesTest extends AbstractTestMessages { String owner = "guest"; - _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, true, false, false); + _logMessage = QueueMessages.CREATED(owner, null, true, true, true, false, false); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -129,7 +129,7 @@ public class QueueMessagesTest extends AbstractTestMessages String owner = "guest"; Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, false, true); + _logMessage = QueueMessages.CREATED(owner, priority, true, true, true, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "Owner:", owner, "AutoDelete", @@ -141,7 +141,7 @@ public class QueueMessagesTest extends AbstractTestMessages public void testQueueCreatedAutoDelete() { - _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, false, false); + _logMessage = QueueMessages.CREATED(null, null, false, true, false, false, false); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete"}; @@ -153,7 +153,7 @@ public class QueueMessagesTest extends AbstractTestMessages { Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(null, priority, false, false, false, false, true); + _logMessage = QueueMessages.CREATED(null, priority, false, false, false, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "Priority:", @@ -166,7 +166,7 @@ public class QueueMessagesTest extends AbstractTestMessages { Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, false, true); + _logMessage = QueueMessages.CREATED(null, priority, false, true, false, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete", @@ -178,7 +178,7 @@ public class QueueMessagesTest extends AbstractTestMessages public void testQueueCreatedAutoDeleteTransient() { - _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, true, false); + _logMessage = QueueMessages.CREATED(null, null, false, true, false, true, false); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete", @@ -191,7 +191,7 @@ public class QueueMessagesTest extends AbstractTestMessages { Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, true, true); + _logMessage = QueueMessages.CREATED(null, priority, false, true, false, true, true); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete", @@ -203,7 +203,7 @@ public class QueueMessagesTest extends AbstractTestMessages public void testQueueCreatedAutoDeleteDurable() { - _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, true, false, false); + _logMessage = QueueMessages.CREATED(null, null, false, true, true, false, false); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete", @@ -216,7 +216,7 @@ public class QueueMessagesTest extends AbstractTestMessages { Integer priority = 3; - _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, true, false, true); + _logMessage = QueueMessages.CREATED(null, priority, false, true, true, false, true); List<Object> log = performLog(); String[] expected = {"Create :", "AutoDelete", @@ -228,7 +228,7 @@ public class QueueMessagesTest extends AbstractTestMessages public void testQueueDeleted() { - _logMessage = QueueMessages.QUE_DELETED(); + _logMessage = QueueMessages.DELETED(); List<Object> log = performLog(); String[] expected = {"Deleted"}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java index b22f2e0b85..b2bc351f8f 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java @@ -31,7 +31,7 @@ public class SubscriptionMessagesTest extends AbstractTestMessages { String arguments = "arguments"; - _logMessage = SubscriptionMessages.SUB_CREATE(arguments, true, true); + _logMessage = SubscriptionMessages.CREATE(arguments, true, true); List<Object> log = performLog(); String[] expected = {"Create :", "Durable", "Arguments :", arguments}; @@ -41,7 +41,7 @@ public class SubscriptionMessagesTest extends AbstractTestMessages public void testSubscriptionCreateDurable() { - _logMessage = SubscriptionMessages.SUB_CREATE(null, true, false); + _logMessage = SubscriptionMessages.CREATE(null, true, false); List<Object> log = performLog(); String[] expected = {"Create :", "Durable"}; @@ -53,7 +53,7 @@ public class SubscriptionMessagesTest extends AbstractTestMessages { String arguments = "arguments"; - _logMessage = SubscriptionMessages.SUB_CREATE(arguments, false, true); + _logMessage = SubscriptionMessages.CREATE(arguments, false, true); List<Object> log = performLog(); String[] expected = {"Create :","Arguments :", arguments}; @@ -64,7 +64,7 @@ public class SubscriptionMessagesTest extends AbstractTestMessages public void testSubscriptionClose() { - _logMessage = SubscriptionMessages.SUB_CLOSE(); + _logMessage = SubscriptionMessages.CLOSE(); List<Object> log = performLog(); String[] expected = {"Close"}; @@ -76,7 +76,7 @@ public class SubscriptionMessagesTest extends AbstractTestMessages { String state = "ACTIVE"; - _logMessage = SubscriptionMessages.SUB_STATE(state); + _logMessage = SubscriptionMessages.STATE(state); List<Object> log = performLog(); String[] expected = {"State :", state}; diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java index 06a8acac29..17d68ef7c3 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java @@ -30,7 +30,7 @@ public class VirtualHostMessagesTest extends AbstractTestMessages public void testVirtualhostCreated() { String name = "test"; - _logMessage = VirtualHostMessages.VHT_CREATED(name); + _logMessage = VirtualHostMessages.CREATED(name); List<Object> log = performLog(); String[] expected = {"Created :", name}; @@ -40,7 +40,7 @@ public class VirtualHostMessagesTest extends AbstractTestMessages public void testSubscriptionClosed() { - _logMessage = VirtualHostMessages.VHT_CLOSED(); + _logMessage = VirtualHostMessages.CLOSED(); List<Object> log = performLog(); String[] expected = {"Closed"}; |