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

5 files changed, 63 insertions, 70 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 2a56ca2121..8d5e6b8ee3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -156,7 +156,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
         Exchange altExchange = queue.getAlternateExchange();
         assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
-        assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
+        assertEquals("Alternate exchange name was not as expected", dlExchangeName.asString(), altExchange.getName());
         assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType().getName());
 
         assertNotNull("The alternate exchange was not registered as expected", exReg.getExchange(dlExchangeName));
@@ -195,7 +195,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryCount());
         Exchange altExchange = queue.getAlternateExchange();
         assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
-        assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
+        assertEquals("Alternate exchange name was not as expected", dlExchangeName.toString(), altExchange.getName());
         assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType().getName());
 
         assertNotNull("The alternate exchange was not registered as expected", exReg.getExchange(dlExchangeName));
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
         {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index 1381390640..b577c916c6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
@@ -461,26 +461,15 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
     public boolean equals(Object o)
     {
 
-
-        if(o instanceof AMQShortString)
-        {
-            return equals((AMQShortString)o);
-        }
-        if(o instanceof CharSequence)
-        {
-            return equals((CharSequence)o);
-        }
-
-        if (o == null)
-        {
-            return false;
-        }
-
         if (o == this)
         {
             return true;
         }
 
+        if(o instanceof AMQShortString)
+        {
+            return equals((AMQShortString) o);
+        }
 
         return false;
 
@@ -544,11 +533,11 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
     }
 
-    public boolean equals(CharSequence s)
+    public boolean equalsCharSequence(CharSequence s)
     {
         if(s instanceof AMQShortString)
         {
-            return equals((AMQShortString)s);
+            return equals((AMQShortString) s);
         }
 
         if (s == null)
@@ -602,7 +591,11 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
 
     public int compareTo(AMQShortString name)
     {
-        if (name == null)
+        if(name == this)
+        {
+            return 0;
+        }
+        else if (name == null)
         {
             return 1;
         }
diff --git a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java b/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
index bcdabfcb3f..0f8fbf0685 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
@@ -126,7 +126,7 @@ public class AMQShortStringTest extends TestCase
         }
         AMQShortString string = new AMQShortString(bytes);
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -139,7 +139,7 @@ public class AMQShortStringTest extends TestCase
     {
         AMQShortString string = new AMQShortString("test");
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -153,7 +153,7 @@ public class AMQShortStringTest extends TestCase
         char[] chars = "test".toCharArray();
         AMQShortString string = new AMQShortString(chars);
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**
@@ -166,7 +166,7 @@ public class AMQShortStringTest extends TestCase
     {
         AMQShortString string = new AMQShortString((CharSequence) "test");
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
-        assertTrue("constructed amq short string differs from expected", string.equals("test"));
+        assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test"));
     }
 
     /**