QPID-3415: Change 0-10 code path to utilise the CallbackHandlerRegistry to create the correct CallbackHandler. The sasl_mechs property/broker option is retained, but continues to be understood only by the 0-10 path.

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

2 files changed, 24 insertions, 36 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 1fa6829bf9..f18f365f20 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -286,10 +286,11 @@ public class ConnectionTest extends QpidBrokerTestCase
         }
         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"));
+            assertTrue("Unexpected exception message : " + e.getMessage(),
+                       e.getMessage().contains("Client and broker have no SASL mechanisms in common."));
+            assertTrue("Unexpected exception message : " + e.getMessage(),
+                    e.getMessage().contains("Client restricted itself to : MY_MECH"));
+
         }
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
index fe929b4965..978ebfa93f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
@@ -20,17 +20,20 @@
  */
 package org.apache.qpid.test.unit.message;
 
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.Session;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Properties;
 
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
 import javax.naming.InitialContext;
-import javax.jms.*;
-import java.util.Properties;
-import java.io.*;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 
 /**
@@ -41,8 +44,6 @@ import java.io.*;
  */
 public class UTF8Test extends QpidBrokerTestCase
 {
-    private static final Logger _logger = LoggerFactory.getLogger(UTF8Test.class);
-
     public void testPlainEn() throws Exception
     {
          invoke("UTF8En");
@@ -65,38 +66,24 @@ public class UTF8Test extends QpidBrokerTestCase
 
     private void runTest(String exchangeName, String queueName, String routingKey, String data) throws Exception
     {
-        _logger.info("Running test for exchange: " + exchangeName
-                + " queue Name: " + queueName
-                + " routing key: " + routingKey);       
-        declareQueue(exchangeName, routingKey, queueName);
+        Connection con =  getConnection();
+        Session sess = con.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
+        final Destination dest = getDestination(exchangeName, routingKey, queueName);
+
+        final MessageConsumer msgCons = sess.createConsumer(dest);
+        con.start();
 
-        javax.jms.Connection con =  getConnection();
-        javax.jms.Session sess = con.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
-        Destination dest = getDestination(exchangeName, routingKey, queueName);
         // Send data
         MessageProducer msgProd = sess.createProducer(dest);
         TextMessage message = sess.createTextMessage(data);
         msgProd.send(message);
+
         // consume data
-        MessageConsumer msgCons = sess.createConsumer(dest);
-        con.start();
         TextMessage m = (TextMessage) msgCons.receive(RECEIVE_TIMEOUT);
         assertNotNull(m);
         assertEquals(m.getText(), data);
     }
 
-    private void declareQueue(String exch, String routkey, String qname) throws Exception
-    {
-        Connection conn = new Connection();
-        conn.connect("localhost", QpidBrokerTestCase.DEFAULT_PORT, "test", "guest", "guest",false);
-        Session sess = conn.createSession(0);
-        sess.exchangeDeclare(exch, "direct", null, null);
-        sess.queueDeclare(qname, null, null);
-        sess.exchangeBind(qname, exch, routkey, null);
-        sess.sync();
-        conn.close();        
-    }
-
     private Destination getDestination(String exch, String routkey, String qname) throws Exception
     {
         Properties props = new Properties();