diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-08-30 15:19:34 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-08-30 15:19:34 +0000 |
| commit | df4c2e62f52fe49cb7473a8ab3107facffb4cda5 (patch) | |
| tree | 5684bb29152ca04a8e64bbaf2825e9d19d2c3b95 /qpid/java/broker/src/test | |
| parent | 5f905e2c794fbac9055678cddbc0ceb0e94701ed (diff) | |
| download | qpid-python-df4c2e62f52fe49cb7473a8ab3107facffb4cda5.tar.gz | |
QPID-2824: Use toLogString rather than toString on LogSubject(s)
Applied patch from Sorin Suciu <ssuciu@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@990820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/test')
4 files changed, 11 insertions, 4 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java index 2cb950ee30..71d06f81ae 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java @@ -113,7 +113,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase _amqpActor.message(new LogSubject() { - public String toString() + public String toLogString() { return "[AMQPActorTest]"; } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java index 6a72a7aaf9..3d4ded5898 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java @@ -69,7 +69,7 @@ public class BaseActorTestCase extends InternalBrokerBaseCase { actor.message(new LogSubject() { - public String toString() + public String toLogString() { return message; } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java index 5bd8f52d70..e253881d09 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java @@ -83,7 +83,7 @@ public abstract class AbstractTestMessages extends InternalBrokerBaseCase // Simple switch to print out all the logged messages //System.err.println(log); - int msgIndex = log.indexOf(_logSubject.toString())+_logSubject.toString().length(); + int msgIndex = log.indexOf(_logSubject.toLogString())+_logSubject.toLogString().length(); assertTrue("Unable to locate Subject:" + log, msgIndex != -1); diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java index 9bbae6df01..888a16053c 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java @@ -91,7 +91,14 @@ public class MockAMQQueue implements AMQQueue public LogSubject getLogSubject() { - return null; + return new LogSubject() + { + public String toLogString() + { + return "[MockAMQQueue]"; + } + + }; } public ConfigStore getConfigStore() |