QPID-4904 : [Java] AMQShortString.equals should on return true if it is being compared to another AMQShortString

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

2 files changed, 46 insertions, 46 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
index 7c461fa13f..7f2288ea3d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
@@ -447,13 +447,13 @@ public class ConnectionURLTest extends TestCase
 
         AMQConnectionURL conn = new AMQConnectionURL(url);
 
-        assertEquals(conn.getDefaultQueueExchangeName(),"test.direct");
+        assertEquals(conn.getDefaultQueueExchangeName().asString(),"test.direct");
 
-        assertEquals(conn.getDefaultTopicExchangeName(),"test.topic");
+        assertEquals(conn.getDefaultTopicExchangeName().asString(),"test.topic");
 
-        assertEquals(conn.getTemporaryQueueExchangeName(),"tmp.direct");
+        assertEquals(conn.getTemporaryQueueExchangeName().asString(),"tmp.direct");
 
-        assertEquals(conn.getTemporaryTopicExchangeName(),"tmp.topic");
+        assertEquals(conn.getTemporaryTopicExchangeName().asString(),"tmp.topic");
 
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index 8f578e6a2f..e13180424b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
@@ -45,10 +45,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(dest.toString()));
 
-        assertTrue(dest.getExchangeClass().equals("exchange.Class"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals("Destination"));
-        assertTrue(dest.getQueueName().equals("Queue"));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchange.Class"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(dest.getQueueName().equalsCharSequence("Queue"));
     }
 
     public void testQueue() throws URISyntaxException
@@ -60,10 +60,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(dest.toString()));
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals(""));
-        assertTrue(dest.getQueueName().equals("Queue"));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence(""));
+        assertTrue(dest.getQueueName().equalsCharSequence("Queue"));
     }
 
     public void testQueueWithOption() throws URISyntaxException
@@ -75,10 +75,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(dest.toString()));
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals(""));
-        assertTrue(dest.getQueueName().equals("Queue"));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence(""));
+        assertTrue(dest.getQueueName().equalsCharSequence("Queue"));
         assertTrue(dest.getOption("option").equals("value"));
     }
 
@@ -92,10 +92,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(dest.toString()));
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals("Destination"));
-        assertTrue(dest.getQueueName().equals(""));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(dest.getQueueName().equalsCharSequence(""));
     }
 
     public void testDestinationWithOption() throws URISyntaxException
@@ -107,10 +107,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(dest.toString()));
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals("Destination"));
-        assertTrue(dest.getQueueName().equals(""));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(dest.getQueueName().equalsCharSequence(""));
 
         assertTrue(dest.getOption("option").equals("value"));
     }
@@ -122,10 +122,10 @@ public class DestinationURLTest extends TestCase
 
         AMQBindingURL dest = new AMQBindingURL(url);
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals("Destination"));
-        assertTrue(dest.getQueueName().equals(""));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(dest.getQueueName().equalsCharSequence(""));
 
         assertTrue(dest.getOption("option").equals("value"));
         assertTrue(dest.getOption("option2").equals("value2"));
@@ -139,9 +139,9 @@ public class DestinationURLTest extends TestCase
         AMQBindingURL dest = new AMQBindingURL(url);
 
         assertTrue(dest.getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS));
-        assertTrue(dest.getExchangeName().equals(""));
-        assertTrue(dest.getDestinationName().equals(""));
-        assertTrue(dest.getQueueName().equals("IBMPerfQueue1"));
+        assertTrue(dest.getExchangeName().equalsCharSequence(""));
+        assertTrue(dest.getDestinationName().equalsCharSequence(""));
+        assertTrue(dest.getQueueName().equalsCharSequence("IBMPerfQueue1"));
 
         assertTrue(dest.getOption("durable").equals("true"));
     }
@@ -153,10 +153,10 @@ public class DestinationURLTest extends TestCase
 
         AMQBindingURL dest = new AMQBindingURL(url);
 
-        assertTrue(dest.getExchangeClass().equals("exchangeClass"));
-        assertTrue(dest.getExchangeName().equals("exchangeName"));
-        assertTrue(dest.getDestinationName().equals("Destination"));
-        assertTrue(dest.getQueueName().equals(""));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(dest.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(dest.getQueueName().equalsCharSequence(""));
 
         assertTrue(dest.getBindingKeys().length == 2);
     }
@@ -188,9 +188,9 @@ public class DestinationURLTest extends TestCase
 
         AMQBindingURL dest = new AMQBindingURL(url);
 
-        assertTrue(dest.getExchangeClass().equals("topic"));
-        assertTrue(dest.getExchangeName().equals("amq.topic"));
-        assertTrue(dest.getQueueName().equals("test:testQueueD"));
+        assertTrue(dest.getExchangeClass().equalsCharSequence("topic"));
+        assertTrue(dest.getExchangeName().equalsCharSequence("amq.topic"));
+        assertTrue(dest.getQueueName().equalsCharSequence("test:testQueueD"));
     }
 
     public void testExchangeOptionsNotPresent() throws URISyntaxException
@@ -320,10 +320,10 @@ public class DestinationURLTest extends TestCase
         AMQBindingURL burl = new AMQBindingURL(url);
 
         assertTrue(url.equals(burl.toString()));
-        assertTrue(burl.getExchangeClass().equals("exchangeClass"));
-        assertTrue(burl.getExchangeName().equals("exchangeName"));
-        assertTrue(burl.getDestinationName().equals("Destination"));
-        assertTrue(burl.getQueueName().equals("Queue"));
+        assertTrue(burl.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(burl.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(burl.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(burl.getQueueName().equalsCharSequence("Queue"));
 
         //check that the MaxDeliveryCount property has the right value
         assertEquals("server",burl.getOption(BindingURL.OPTION_REJECT_BEHAVIOUR));
@@ -353,10 +353,10 @@ public class DestinationURLTest extends TestCase
 
         assertTrue(url.equals(burl.toString()));
 
-        assertTrue(burl.getExchangeClass().equals("exchangeClass"));
-        assertTrue(burl.getExchangeName().equals("exchangeName"));
-        assertTrue(burl.getDestinationName().equals("Destination"));
-        assertTrue(burl.getQueueName().equals("Queue"));
+        assertTrue(burl.getExchangeClass().equalsCharSequence("exchangeClass"));
+        assertTrue(burl.getExchangeName().equalsCharSequence("exchangeName"));
+        assertTrue(burl.getDestinationName().equalsCharSequence("Destination"));
+        assertTrue(burl.getQueueName().equalsCharSequence("Queue"));
 
         class MyTestAMQDestination extends AMQDestination
         {