Repository: qpid-jms Updated Branches: refs/heads/master f2ff78e64 -> f4dd5875e
Delegate all toString methods in the JMS Message classes to their facade instance for creation of a meaningful message string. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f4dd5875 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f4dd5875 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f4dd5875 Branch: refs/heads/master Commit: f4dd5875e3d0adbc51c8e06221261e6dde3ebbb4 Parents: f2ff78e Author: Timothy Bish <tabish...@gmail.com> Authored: Thu Oct 9 14:30:11 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Thu Oct 9 14:30:11 2014 -0400 ---------------------------------------------------------------------- .../qpid/jms/message/JmsBytesMessage.java | 2 +- .../apache/qpid/jms/message/JmsMapMessage.java | 3 +-- .../org/apache/qpid/jms/message/JmsMessage.java | 5 +++++ .../qpid/jms/message/JmsStreamMessage.java | 3 +-- .../apache/qpid/jms/message/JmsTextMessage.java | 10 +--------- .../qpid/jms/message/JmsBytesMessageTest.java | 6 ++++++ .../qpid/jms/message/JmsMapMessageTest.java | 6 ++++++ .../apache/qpid/jms/message/JmsMessageTest.java | 6 ++++++ .../qpid/jms/message/JmsStreamMessageTest.java | 10 +++++++--- .../qpid/jms/message/JmsTextMessageTest.java | 20 ++++---------------- 10 files changed, 38 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java index 6de4180..f5a6cf7 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java @@ -399,7 +399,7 @@ public class JmsBytesMessage extends JmsMessage implements BytesMessage { @Override public String toString() { - return super.toString() + " JmsBytesMessage{ " + "bytesOut = " + dataOut + ", dataIn = " + dataIn + " }"; + return "JmsBytesMessage { " + facade + " }"; } private void initializeWriting() throws JMSException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java index e79cd78..659d4f7 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java @@ -300,8 +300,7 @@ public class JmsMapMessage extends JmsMessage implements MapMessage { @Override public String toString() { - // TODO - better toString implementation. - return "JmsMapMessage{ }"; + return "JmsMapMessage { " + facade + " }"; } private void put(String name, Object value) throws JMSException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java index 33ed19c..a67f941 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java @@ -564,6 +564,11 @@ public class JmsMessage implements javax.jms.Message { facade.setRedelivered(redelivered); } + @Override + public String toString() { + return "JmsMessage { " + facade + " }"; + } + protected void checkReadOnlyProperties() throws MessageNotWriteableException { if (readOnlyProperties) { throw new MessageNotWriteableException("Message properties are read-only"); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsStreamMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsStreamMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsStreamMessage.java index b293274..05a4b79 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsStreamMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsStreamMessage.java @@ -472,8 +472,7 @@ public class JmsStreamMessage extends JmsMessage implements StreamMessage { @Override public String toString() { - // TODO - Better toString() - return super.toString() + " JmsStreamMessage{ " + facade + " }"; + return "JmsStreamMessage { " + facade.toString() + " }"; } private void checkBytesInFlight() throws MessageFormatException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsTextMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsTextMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsTextMessage.java index a08550e..6116b81 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsTextMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsTextMessage.java @@ -55,14 +55,6 @@ public class JmsTextMessage extends JmsMessage implements TextMessage { @Override public String toString() { - - String text = ""; - try { - text = facade.getText(); - } catch (JMSException e) { - } - - // TODO - Better toString implementation - return super.toString() + ":text=" + text; + return "JmsTextMessage { " + facade.toString() + " }"; } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java index 00c49e3..e672ee3 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java @@ -42,6 +42,12 @@ public class JmsBytesMessageTest { private final JmsMessageFactory factory = new JmsDefaultMessageFactory(); + @Test + public void testToString() throws Exception { + JmsBytesMessage bytesMessage = factory.createBytesMessage(); + assertTrue(bytesMessage.toString().startsWith("JmsBytesMessage")); + } + /** * Test that calling {@link BytesMessage#getBodyLength()} on a new message which has been * populated and {@link BytesMessage#reset()} causes the length to be reported correctly. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java index e8a1889..7a19c9e 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java @@ -47,6 +47,12 @@ public class JmsMapMessageTest { // ======= general ========= @Test + public void testToString() throws Exception { + JmsMapMessage mapMessage = factory.createMapMessage(); + assertTrue(mapMessage.toString().startsWith("JmsMapMessage")); + } + + @Test public void testGetMapNamesWithNewMessageToSendReturnsEmptyEnumeration() throws Exception { JmsMapMessage mapMessage = factory.createMapMessage(); Enumeration<?> names = mapMessage.getMapNames(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java index 3a1b554..f5ca53a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java @@ -80,6 +80,12 @@ public class JmsMessageTest { } @Test + public void testToString() throws Exception { + JmsMessage msg = factory.createMessage(); + assertTrue(msg.toString().startsWith("JmsMessage")); + } + + @Test public void testHashCode() throws Exception { JmsMessage msg = factory.createMessage(); msg.setJMSMessageID(this.jmsMessageID); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java index e0356bd..422b63b 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java @@ -37,9 +37,6 @@ import javax.jms.StreamMessage; import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFactory; import org.junit.Test; -/** - * - */ public class JmsStreamMessageTest { private final JmsMessageFactory factory = new JmsDefaultMessageFactory(); @@ -47,6 +44,13 @@ public class JmsStreamMessageTest { // ======= general ========= @Test + public void testToString() throws Exception { + JmsStreamMessage streamMessage = factory.createStreamMessage(); + streamMessage.onDispatch(); + assertTrue(streamMessage.toString().startsWith("JmsStreamMessage")); + } + + @Test public void testReadWithEmptyStreamThrowsMEOFE() throws Exception { JmsStreamMessage streamMessage = factory.createStreamMessage(); streamMessage.reset(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f4dd5875/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsTextMessageTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsTextMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsTextMessageTest.java index 605143a..ec71189 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsTextMessageTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsTextMessageTest.java @@ -28,8 +28,6 @@ import javax.jms.JMSException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.apache.qpid.jms.message.JmsMessageFactory; -import org.apache.qpid.jms.message.JmsTextMessage; import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFactory; import org.junit.Test; @@ -112,21 +110,11 @@ public class JmsTextMessageTest { } } - // TODO - Fix toString and null body. @Test - public void testShortText() throws Exception { - String shortText = "Content"; - JmsTextMessage shortMessage = factory.createTextMessage(); - shortMessage.setText(shortText); - //assertTrue(shortMessage.toString().contains("text = " + shortText)); - assertTrue(shortMessage.getText().equals(shortText)); - - String longText = "Very very very very veeeeeeery loooooooooooooooooooooooooooooooooong text"; - // String longExpectedText = "Very very very very veeeeeeery looooooooooooo...ooooong text"; - JmsTextMessage longMessage = factory.createTextMessage(); - longMessage.setText(longText); - //assertTrue(longMessage.toString().contains("text = " + longExpectedText)); - assertTrue(longMessage.getText().equals(longText)); + public void testToString() throws Exception { + JmsTextMessage textMessage = factory.createTextMessage(); + textMessage.onDispatch(); + assertTrue(textMessage.toString().startsWith("JmsTextMessage")); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
