You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/01/16 08:58:25 UTC

svn commit: r1778992 [3/3] - in /qpid/java/trunk: bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ systests/qpid-systests-jms_2.0/ systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/connect...

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java Mon Jan 16 08:58:24 2017
@@ -23,7 +23,6 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
@@ -43,7 +42,7 @@ public class DurableSubscriberTest exten
     /**
      * test strategy:
      * create and register a durable subscriber then close it
-     * create a publisher and send a persistant message followed by a non persistant message
+     * create a publisher and send a persistent message followed by a non persistant message
      * crash and restart the broker
      * recreate the durable subscriber and check that only the first message is received
      */
@@ -51,10 +50,9 @@ public class DurableSubscriberTest exten
     {
         if (isBrokerStorePersistent())
         {
-            TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory();
-            Topic topic = (Topic) getInitialContext().lookup(_topicName);
+            TopicConnection durConnection = (TopicConnection) getConnection();
+            Topic topic = createTopic(durConnection, _topicName);
             //create and register a durable subscriber then close it
-            TopicConnection durConnection = factory.createTopicConnection("guest", "guest");
             TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, "dursub");
             durConnection.start();
@@ -63,7 +61,7 @@ public class DurableSubscriberTest exten
             durConnection.stop();
 
             //create a publisher and send a persistant message followed by a non persistant message
-            TopicConnection pubConnection = factory.createTopicConnection("guest", "guest");
+            TopicConnection pubConnection = (TopicConnection) getConnection();
             TopicSession pubSession = pubConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicPublisher publisher = pubSession.createPublisher(topic);
             Message message = pubSession.createMessage();
@@ -86,9 +84,7 @@ public class DurableSubscriberTest exten
                 throw e;
             }
             //now recreate the durable subscriber and check the received messages
-            factory = (TopicConnectionFactory) getConnectionFactory();
-            topic = (Topic) getInitialContext().lookup(_topicName);
-            TopicConnection durConnection2 = factory.createTopicConnection("guest", "guest");
+            TopicConnection durConnection2 = (TopicConnection) getConnection();
             TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, "dursub");
             durConnection2.start();
@@ -105,6 +101,8 @@ public class DurableSubscriberTest exten
         }
     }
 
+
+
     /**
      * create and register a durable subscriber with a message selector and then close it
      * crash the broker
@@ -115,10 +113,9 @@ public class DurableSubscriberTest exten
     {
         if (isBrokerStorePersistent())
         {
-            TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory();
-            Topic topic = (Topic) getInitialContext().lookup(_topicName);
             //create and register a durable subscriber with a message selector and then close it
-            TopicConnection durConnection = factory.createTopicConnection("guest", "guest");
+            TopicConnection durConnection = (TopicConnection) getConnection();
+            final Topic topic = createTopic(durConnection, _topicName);
             TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, "dursub", "testprop='true'", false);
             durConnection.start();
@@ -135,9 +132,7 @@ public class DurableSubscriberTest exten
                 _logger.error("problems restarting broker: " + e);
                 throw e;
             }
-            topic = (Topic) getInitialContext().lookup(_topicName);
-            factory = (TopicConnectionFactory) getConnectionFactory();
-            TopicConnection pubConnection = factory.createTopicConnection("guest", "guest");
+            TopicConnection pubConnection = (TopicConnection) getConnection();
             TopicSession pubSession = pubConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicPublisher publisher = pubSession.createPublisher(topic);
             for (int i = 0; i < 5; i++)
@@ -153,7 +148,7 @@ public class DurableSubscriberTest exten
             pubSession.close();
 
             //now recreate the durable subscriber and check the received messages
-            TopicConnection durConnection2 = factory.createTopicConnection("guest", "guest");
+            TopicConnection durConnection2 = (TopicConnection) getConnection();
             TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, "dursub", "testprop='true'", false);
             durConnection2.start();
@@ -193,11 +188,9 @@ public class DurableSubscriberTest exten
         
         final String SUB_NAME=getTestQueueName();
         
-        TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory();
-        Topic topic = (Topic) getInitialContext().lookup(_topicName);
-        
         //create and register a durable subscriber then unsubscribe it
-        TopicConnection durConnection = factory.createTopicConnection("guest", "guest");
+        TopicConnection durConnection = (TopicConnection) getConnection();
+        Topic topic = createTopic(durConnection, _topicName);
         TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, SUB_NAME);
         durConnection.start();
@@ -207,7 +200,7 @@ public class DurableSubscriberTest exten
         durConnection.close();
 
         //create and register a durable subscriber with a message selector and then close it
-        TopicConnection durConnection2 = factory.createTopicConnection("guest", "guest");
+        TopicConnection durConnection2 = (TopicConnection) getConnection();
         TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
         durConnection2.start();
@@ -227,7 +220,7 @@ public class DurableSubscriberTest exten
         }
         
         //send messages matching and not matching the selector
-        TopicConnection pubConnection = factory.createTopicConnection("guest", "guest");
+        TopicConnection pubConnection = (TopicConnection) getConnection();
         TopicSession pubSession = pubConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicPublisher publisher = pubSession.createPublisher(topic);
         for (int i = 0; i < 5; i++)
@@ -244,7 +237,7 @@ public class DurableSubscriberTest exten
 
         //now recreate the durable subscriber with selector to check there are no exceptions generated
         //and then verify the messages are received correctly
-        TopicConnection durConnection3 = (TopicConnection) factory.createConnection("guest", "guest");
+        TopicConnection durConnection3 = (TopicConnection) getConnection();
         TopicSession durSession3 = (TopicSession) durConnection3.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub3 = durSession3.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
         durConnection3.start();
@@ -287,12 +280,10 @@ public class DurableSubscriberTest exten
         }
         
         final String SUB_NAME=getTestQueueName();
-        
-        TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory();
-        Topic topic = (Topic) getInitialContext().lookup(_topicName);
-        
+
         //create and register a durable subscriber with selector then unsubscribe it
-        TopicConnection durConnection = factory.createTopicConnection("guest", "guest");
+        TopicConnection durConnection = (TopicConnection) getConnection();
+        Topic topic = createTopic(durConnection, _topicName);
         TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
         durConnection.start();
@@ -302,7 +293,7 @@ public class DurableSubscriberTest exten
         durConnection.close();
 
         //create and register a durable subscriber without the message selector and then close it
-        TopicConnection durConnection2 = factory.createTopicConnection("guest", "guest");
+        TopicConnection durConnection2 = (TopicConnection) getConnection();
         TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, SUB_NAME);
         durConnection2.start();
@@ -322,7 +313,7 @@ public class DurableSubscriberTest exten
         }
         
         //send messages matching and not matching the original used selector
-        TopicConnection pubConnection = factory.createTopicConnection("guest", "guest");
+        TopicConnection pubConnection = (TopicConnection) getConnection();
         TopicSession pubSession = pubConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicPublisher publisher = pubSession.createPublisher(topic);
         for (int i = 1; i <= 5; i++)
@@ -339,7 +330,7 @@ public class DurableSubscriberTest exten
 
         //now recreate the durable subscriber without selector to check there are no exceptions generated
         //then verify ALL messages sent are received
-        TopicConnection durConnection3 = (TopicConnection) factory.createConnection("guest", "guest");
+        TopicConnection durConnection3 = (TopicConnection) getConnection();
         TopicSession durSession3 = (TopicSession) durConnection3.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber durSub3 = durSession3.createDurableSubscriber(topic, SUB_NAME);
         durConnection3.start();
@@ -455,7 +446,7 @@ public class DurableSubscriberTest exten
         }
         
         // Reconnect to broker
-        TopicConnection connection = (TopicConnection) getConnectionFactory().createConnection("guest", "guest");
+        TopicConnection connection = (TopicConnection) getConnection();
         connection.start();
         session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         topic = createTopic(connection, "testResubscribeWithChangedSelectorAndRestart");

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java Mon Jan 16 08:58:24 2017
@@ -56,25 +56,15 @@ public class JMSPropertiesTest extends Q
     protected static final String NULL_OBJECT_PROPERTY = "NullObject";
     protected static final String INVALID_OBJECT_PROPERTY = "InvalidObject";
 
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-
     public void testJMSProperties() throws Exception
     {
-        Connection con = getConnection("guest", "guest");
+        Connection con = getConnection();
         Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
         Queue queue = createTestQueue(consumerSession, "someQ");
         MessageConsumer consumer = consumerSession.createConsumer(queue);
 
-        Connection con2 = getConnection("guest", "guest");
+        Connection con2 = getConnection();
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
         Destination JMS_REPLY_TO = createTestQueue(producerSession, "my.replyto");
@@ -156,7 +146,7 @@ public class JMSPropertiesTest extends Q
      */
     public void testQpidExtensionProperties() throws Exception
     {
-        Connection con = getConnection("guest", "guest");
+        Connection con = getConnection();
         Session ssn = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         con.start();
 

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java Mon Jan 16 08:58:24 2017
@@ -48,12 +48,12 @@ public class StreamMessageTest extends Q
 
     public void testStreamMessageEOF() throws Exception
     {
-        Connection con = getConnection("guest", "guest");
+        Connection con = getConnection();
         Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         Queue queue = createTestQueue(consumerSession);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
 
-        Connection con2 = getConnection("guest", "guest");
+        Connection con2 = getConnection();
 
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
@@ -95,7 +95,7 @@ public class StreamMessageTest extends Q
         final CountDownLatch awaitMessages = new CountDownLatch(1);
         final AtomicReference<Throwable> listenerCaughtException = new AtomicReference<Throwable>();
 
-        Connection con = getConnection("guest", "guest");
+        Connection con = getConnection();
         Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = createTestQueue(session);
         session.close();
@@ -125,7 +125,7 @@ public class StreamMessageTest extends Q
                 }
             });
 
-        Connection con2 = getConnection("guest", "guest");
+        Connection con2 = getConnection();
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
         con.start();

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java Mon Jan 16 08:58:24 2017
@@ -22,7 +22,6 @@ package org.apache.qpid.test.unit.topic;
 
 import javax.jms.Connection;
 import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -33,13 +32,10 @@ import javax.jms.TopicConnection;
 import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
-import javax.naming.NamingException;
 
-import org.apache.qpid.QpidException;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.url.URLSyntaxException;
 
 
 public class TopicSessionTest extends QpidBrokerTestCase
@@ -47,7 +43,7 @@ public class TopicSessionTest extends Qp
     public void testTopicSubscriptionUnsubscription() throws Exception
     {
 
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
         String topicName = "MyTopic";
         Topic topic = createTopic(con, topicName);
         TopicSession session1 = con.createTopicSession(true, AMQSession.NO_ACKNOWLEDGE);
@@ -95,7 +91,7 @@ public class TopicSessionTest extends Qp
 
     private void subscriptionNameReuseForDifferentTopic(boolean shutdown) throws Exception
     {
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
         Topic topic = createTopic(con, "MyTopic1" + String.valueOf(shutdown));
         Topic topic2 = createTopic(con, "MyOtherTopic1" + String.valueOf(shutdown));
 
@@ -115,7 +111,7 @@ public class TopicSessionTest extends Qp
         {
             session1.close();
             con.close();
-            con = (TopicConnection) getConnection("guest", "guest");
+            con = (TopicConnection) getConnection();
             con.start();
             session1 = con.createTopicSession(true, Session.AUTO_ACKNOWLEDGE);
             publisher = session1.createPublisher(null);
@@ -178,7 +174,7 @@ public class TopicSessionTest extends Qp
     public void testTextMessageCreation() throws Exception
     {
 
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
         Topic topic = createTopic(con, "MyTopic4");
         TopicSession session1 = con.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(topic);
@@ -226,7 +222,7 @@ public class TopicSessionTest extends Qp
     public void testNoLocal() throws Exception
     {
 
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
 
         Topic topic = createTopic(con, "testNoLocal");
 
@@ -240,7 +236,7 @@ public class TopicSessionTest extends Qp
     public void testNoLocalDirectExchange() throws Exception
     {
 
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
 
         Topic topic = createTopicOnDirect(con, "testNoLocal");
 
@@ -255,7 +251,7 @@ public class TopicSessionTest extends Qp
     public void testNoLocalFanoutExchange() throws Exception
     {
 
-        TopicConnection con = (TopicConnection) getConnection("guest", "guest");
+        TopicConnection con = (TopicConnection) getConnection();
 
         Topic topic = createTopicOnFanout(con, "testNoLocal");
 
@@ -265,8 +261,7 @@ public class TopicSessionTest extends Qp
     }
 
 
-    private void noLocalTest(TopicConnection con, Topic topic)
-            throws JMSException, URLSyntaxException, QpidException, NamingException
+    private void noLocalTest(TopicConnection con, Topic topic) throws Exception
     {
         TopicSession session1 = con.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE);
         TopicSubscriber noLocal = session1.createSubscriber(topic,  "", true);

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Mon Jan 16 08:58:24 2017
@@ -55,13 +55,14 @@ public class TransactedTest extends Qpid
     private MessageConsumer testConsumer2;
     private static final Logger _logger = LoggerFactory.getLogger(TransactedTest.class);
 
-    protected void setUp() throws Exception
+    @Override
+    public void setUp() throws Exception
     {
         try
         {
             super.setUp();
             _logger.info("Create Connection");
-            con = getConnection("guest", "guest");
+            con = getConnection();
             _logger.info("Create Session");
             session = con.createSession(true, Session.SESSION_TRANSACTED);
             _logger.info("Create Q1");
@@ -85,7 +86,7 @@ public class TransactedTest extends Qpid
             con.start();
 
             _logger.info("Create prep connection");
-            prepCon = getConnection("guest", "guest");
+            prepCon = getConnection();
 
             _logger.info("Create prep session");
             prepSession = prepCon.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -97,7 +98,7 @@ public class TransactedTest extends Qpid
             prepCon.start();
 
             _logger.info("Create test connection");
-            testCon = getConnection("guest", "guest");
+            testCon = getConnection();
             _logger.info("Create test session");
             testSession = testCon.createSession(false, Session.AUTO_ACKNOWLEDGE);
             _logger.info("Create test consumer of q2");
@@ -111,7 +112,8 @@ public class TransactedTest extends Qpid
         }
     }
 
-    protected void tearDown() throws Exception
+    @Override
+    public void tearDown() throws Exception
     {
         try
         {
@@ -224,14 +226,14 @@ public class TransactedTest extends Qpid
 
     public void testResendsMsgsAfterSessionClose() throws Exception
     {
-        Connection con = getConnection("guest", "guest");
+        Connection con = getConnection();
 
         Session consumerSession = con.createSession(true, Session.SESSION_TRANSACTED);
         Queue queue3 = createTestQueue(session, "Q3");
         session.commit();
         MessageConsumer consumer = consumerSession.createConsumer(queue3);
 
-        Connection con2 = getConnection("guest", "guest");
+        Connection con2 = getConnection();
         Session producerSession = con2.createSession(true, Session.SESSION_TRANSACTED);
         MessageProducer producer = producerSession.createProducer(queue3);
 

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java Mon Jan 16 08:58:24 2017
@@ -96,6 +96,7 @@ public class FaultTest extends AbstractX
         junit.textui.TestRunner.run(getSuite());
     }
 
+    @Override
     public void tearDown() throws Exception
     {
         if (!isBroker08())

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java Mon Jan 16 08:58:24 2017
@@ -23,6 +23,7 @@ package org.apache.qpid.test.utils;
 import java.util.concurrent.CountDownLatch;
 
 import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
 import javax.naming.NamingException;
 
 import org.slf4j.Logger;
@@ -41,6 +42,7 @@ public class FailoverBaseCase extends Qp
     protected BrokerHolder _alternativeBroker;
     protected int _port;
     protected int _alternativePort;
+    private ConnectionFactory _connectionFactory;
 
     @Override
     protected void setUp() throws Exception
@@ -61,7 +63,7 @@ public class FailoverBaseCase extends Qp
     /**
      * We are using failover factories
      *
-     * @return a connection 
+     * @return a connection
      * @throws Exception
      */
     @Override
@@ -82,6 +84,12 @@ public class FailoverBaseCase extends Qp
         return _connectionFactory;
     }
 
+    @Override
+    public javax.jms.Connection getConnection() throws JMSException, NamingException
+    {
+        return getConnectionFactory().createConnection(GUEST_USERNAME, GUEST_PASSWORD);
+    }
+
     public void failDefaultBroker()
     {
         failBroker(getDefaultBroker());

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java Mon Jan 16 08:58:24 2017
@@ -90,7 +90,7 @@ public class ConnectionEstablishmentTest
     public void testAuthenticationBypass() throws Exception
     {
         String virtualHost = TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST;
-        ConnectionURL connectionURL = ((AMQConnectionFactory)getConnectionFactory()).getConnectionURL();
+        ConnectionURL connectionURL = ((AMQConnectionFactory) getConnectionFactory()).getConnectionURL();
         BrokerDetails brokerDetails = connectionURL.getAllBrokerDetails().get(0);
         try (Socket socket = new Socket(brokerDetails.getHost(), brokerDetails.getPort());
              OutputStream os = socket.getOutputStream())

Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1778992&r1=1778991&r2=1778992&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Mon Jan 16 08:58:24 2017
@@ -176,11 +176,24 @@ org.apache.qpid.test.unit.close.JavaServ
 org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionCreateDurable
 org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionCreateDurableWithArguments
 
+// Qpid JMS Client does not accept key material in forms apart from JKS and PKCS
+org.apache.qpid.client.ssl.SSLTest#testCreateSSLConnectionWithCertificateTrust
+org.apache.qpid.client.ssl.SSLTest#testCreateSSLWithCertFileAndPrivateKey
+// Test requires modification of javax.net.ssl system properties but Qpid JMS Client reads them only once
+org.apache.qpid.client.ssl.SSLTest#testCreateSSLConnectionUsingSystemProperties
+org.apache.qpid.client.ssl.SSLTest#testSslConnectionOption
+org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHost
+// Test frame does not allow us to override hostname
+org.apache.qpid.client.ssl.SSLTest#testHostVerificationIsOnByDefault
+org.apache.qpid.client.ssl.SSLTest#testVerifyHostNameWithIncorrectHostname
+// 0-x client specific feature
+org.apache.qpid.client.ssl.SSLTest#testSslConnectionOptionOverridesBrokerlistOption
 
+// Test assumes BURL and Connection URL format
+org.apache.qpid.systest.rest.ExportImportMessagesRestTest#testExtractImportEndToEnd
 
-
-
-
+// Qpid JMS Client does not support the use of preestablished socket
+org.apache.qpid.client.connection.ExistingSocketTest#*
 
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org