1 files changed, 22 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 6bf610ff90..68d774fce6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -272,6 +272,28 @@ public class ConnectionTest extends QpidBrokerTestCase
         }
         connection.close();
     }
+    
+    public void testUnsupportedSASLMechanism() throws Exception
+    {
+        BrokerDetails broker = getBroker();
+        broker.setProperty(BrokerDetails.OPTIONS_SASL_MECHS, "MY_MECH");
+
+        try
+        {
+            Connection connection = new AMQConnection(broker.toString(), "guest", "guest",
+                    null, "test");
+            connection.close();
+            fail("The client should throw a ConnectionException stating the" +
+            		" broker does not support the SASL mech specified by the client");
+        }
+        catch (Exception e)
+        {
+            assertTrue("Incorrect exception thrown",
+                       e.getMessage().contains("The following SASL mechanisms " +
+                       "[MY_MECH]"  + 
+                       " specified by the client are not supported by the broker"));
+        }
+    }
 
     public static junit.framework.Test suite()
     {