QPID-333 Committed test class rename to stop it being picked up by Surefire

AMQTopic.java - whitespace

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

4 files changed, 12 insertions, 11 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index f50b0390c5..c82187b2e7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
@@ -28,12 +28,12 @@ import javax.jms.JMSException;
 import javax.jms.Topic;
 
 public class AMQTopic extends AMQDestination implements Topic
-    {
+{
     /**
-    * Constructor for use in creating a topic using a BindingURL.
+     * Constructor for use in creating a topic using a BindingURL.
      *
      * @param binding The binding url object.
-    */
+     */
     public AMQTopic(BindingURL binding)
     {
         super(binding);
@@ -78,7 +78,7 @@ public class AMQTopic extends AMQDestination implements Topic
         return super.getDestinationName().toString();
     }
 
-     public AMQShortString getRoutingKey()
+    public AMQShortString getRoutingKey()
     {
         return getDestinationName();
     }
@@ -93,7 +93,7 @@ public class AMQTopic extends AMQDestination implements Topic
      * Override since the queue is always private and we must ensure it remains null. If not,
      * reuse of the topic when registering consumers will make all consumers listen on the same (private) queue rather
      * than getting their own (private) queue.
-     *
+     * <p/>
      * This is relatively nasty but it is difficult to come up with a more elegant solution, given
      * the requirement in the case on AMQQueue and possibly other AMQDestination subclasses to
      * use the underlying queue name even where it is server generated.
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
index f30b8ddc9d..6bb9b9912b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
@@ -121,8 +121,9 @@ public class MessageConverter
 
     public MessageConverter(Message message) throws JMSException
     {
-        //TODO; Do we really want to create an empty message here ?
-        BytesMessage nativeMessage = new JMSBytesMessage();                
+        //Send a message with just properties.
+        // Throwing away content
+        BytesMessage nativeMessage = new JMSBytesMessage();
 
         _newMessage = (AbstractJMSMessage) nativeMessage;
         setMessageProperties(message);
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java b/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
index f7bea1b36a..c3434164d8 100644
--- a/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java
+++ b/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
@@ -24,7 +24,7 @@ import javax.jms.*;
 import java.util.Enumeration;
 import java.io.Serializable;
 
-public class TestNonQpidTextMessage implements ObjectMessage {
+public class NonQpidObjectMessage implements ObjectMessage {
 
     private JMSObjectMessage _realMessage;
     private String _contentString;
@@ -34,7 +34,7 @@ public class TestNonQpidTextMessage implements ObjectMessage {
      * does not inherit from the Qpid message superclasses
      * and expand our unit testing of MessageConverter et al
      */
-    public TestNonQpidTextMessage()
+    public NonQpidObjectMessage()
     {
         _realMessage = new JMSObjectMessage();
     }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index c09d2504eb..2d61ceb00f 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
@@ -26,7 +26,7 @@ import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.message.TestNonQpidTextMessage;
+import org.apache.qpid.client.message.NonQpidObjectMessage;
 import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.*;
@@ -71,7 +71,7 @@ public class JMSPropertiesTest extends TestCase
         MessageProducer producer = producerSession.createProducer(queue);
 
         //create a test message to send
-        ObjectMessage sentMsg = new TestNonQpidTextMessage();
+        ObjectMessage sentMsg = new NonQpidObjectMessage();
         sentMsg.setJMSCorrelationID(JMS_CORR_ID);
         sentMsg.setJMSDeliveryMode(JMS_DELIV_MODE);
         sentMsg.setJMSType(JMS_TYPE);