Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java Thu Nov 24 09:14:51 2016 @@ -20,15 +20,14 @@ */ package org.apache.qpid.test.unit.close; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - import javax.jms.Session; import javax.jms.Topic; +import javax.jms.TopicConnection; import javax.jms.TopicPublisher; import javax.jms.TopicSession; +import org.apache.qpid.test.utils.QpidBrokerTestCase; + /** * @author Apache Software Foundation */ @@ -48,9 +47,9 @@ public class TopicPublisherCloseTest ext public void testAllMethodsThrowAfterConnectionClose() throws Exception { - AMQConnection connection = (AMQConnection) getConnection("guest", "guest"); + TopicConnection connection = (TopicConnection) getConnection("guest", "guest"); - Topic destination1 = new AMQTopic(connection, "t1"); + Topic destination1 = createTopic(connection, "t1"); TopicSession session1 = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); TopicPublisher pub = session1.createPublisher(destination1); connection.close();
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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -17,7 +17,6 @@ */ package org.apache.qpid.test.unit.ct; -import javax.jms.Connection; import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.Session; @@ -29,10 +28,8 @@ import javax.jms.TopicPublisher; import javax.jms.TopicSession; import javax.jms.TopicSubscriber; -import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.AMQTopic; import org.apache.qpid.test.utils.QpidBrokerTestCase; /** @@ -54,7 +51,7 @@ public class DurableSubscriberTest exten { if (isBrokerStorePersistent()) { - TopicConnectionFactory factory = getConnectionFactory(); + TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory(); Topic topic = (Topic) getInitialContext().lookup(_topicName); //create and register a durable subscriber then close it TopicConnection durConnection = factory.createTopicConnection("guest", "guest"); @@ -89,7 +86,7 @@ public class DurableSubscriberTest exten throw e; } //now recreate the durable subscriber and check the received messages - factory = getConnectionFactory(); + factory = (TopicConnectionFactory) getConnectionFactory(); topic = (Topic) getInitialContext().lookup(_topicName); TopicConnection durConnection2 = factory.createTopicConnection("guest", "guest"); TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); @@ -118,7 +115,7 @@ public class DurableSubscriberTest exten { if (isBrokerStorePersistent()) { - TopicConnectionFactory factory = getConnectionFactory(); + 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"); @@ -139,7 +136,7 @@ public class DurableSubscriberTest exten throw e; } topic = (Topic) getInitialContext().lookup(_topicName); - factory = getConnectionFactory(); + factory = (TopicConnectionFactory) getConnectionFactory(); TopicConnection pubConnection = factory.createTopicConnection("guest", "guest"); TopicSession pubSession = pubConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); TopicPublisher publisher = pubSession.createPublisher(topic); @@ -196,7 +193,7 @@ public class DurableSubscriberTest exten final String SUB_NAME=getTestQueueName(); - TopicConnectionFactory factory = getConnectionFactory(); + TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory(); Topic topic = (Topic) getInitialContext().lookup(_topicName); //create and register a durable subscriber then unsubscribe it @@ -291,7 +288,7 @@ public class DurableSubscriberTest exten final String SUB_NAME=getTestQueueName(); - TopicConnectionFactory factory = getConnectionFactory(); + TopicConnectionFactory factory = (TopicConnectionFactory) getConnectionFactory(); Topic topic = (Topic) getInitialContext().lookup(_topicName); //create and register a durable subscriber with selector then unsubscribe it @@ -371,10 +368,10 @@ public class DurableSubscriberTest exten return; } - Connection conn = getConnection(); + TopicConnection conn = (TopicConnection) getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "testResubscribeWithChangedSelectorAndRestart"); + Topic topic = createTopic(conn, "testResubscribeWithChangedSelectorAndRestart"); MessageProducer producer = session.createProducer(topic); // Create durable subscriber that matches A @@ -458,10 +455,10 @@ public class DurableSubscriberTest exten } // Reconnect to broker - Connection connection = getConnectionFactory().createConnection("guest", "guest"); + TopicConnection connection = (TopicConnection) getConnectionFactory().createConnection("guest", "guest"); connection.start(); session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - topic = new AMQTopic((AMQConnection) connection, "testResubscribeWithChangedSelectorAndRestart"); + topic = createTopic(connection, "testResubscribeWithChangedSelectorAndRestart"); producer = session.createProducer(topic); //verify no messages now present on the queue after we restart the broker Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu Nov 24 09:14:51 2016 @@ -34,6 +34,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import javax.jms.TopicConnection; import javax.jms.TopicSubscriber; import org.slf4j.Logger; @@ -43,7 +44,6 @@ import org.apache.qpid.client.AMQConnect import org.apache.qpid.client.AMQNoRouteException; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.AMQTopic; import org.apache.qpid.test.utils.QpidBrokerTestCase; /** @@ -70,8 +70,8 @@ public class DurableSubscriptionTest ext public void testUnsubscribe() throws Exception { - AMQConnection con = (AMQConnection) getConnection(); - AMQTopic topic = new AMQTopic(con, "MyDurableSubscriptionTestTopic"); + TopicConnection con = (TopicConnection) getConnection(); + Topic topic = createTopic(con, "MyDurableSubscriptionTestTopic"); _logger.info("Create Session 1"); Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE); _logger.info("Create Consumer on Session 1"); @@ -155,7 +155,7 @@ public class DurableSubscriptionTest ext connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Topic topic = new AMQTopic(connection, MY_TOPIC); + Topic topic = createTopic(connection, MY_TOPIC); MessageProducer producer = session.createProducer(topic); TopicSubscriber subscriber = session.createDurableSubscriber(topic, MY_SUBSCRIPTION, "1 = 1", false); @@ -241,8 +241,8 @@ public class DurableSubscriptionTest ext private void durabilityImpl(int ackMode, boolean restartBroker) throws Exception { - AMQConnection con = (AMQConnection) getConnection(); - AMQTopic topic = new AMQTopic(con, MY_TOPIC); + TopicConnection con = (TopicConnection) getConnection(); + Topic topic = createTopic(con, MY_TOPIC); Session session1 = con.createSession(false, ackMode); MessageConsumer consumer1 = session1.createConsumer(topic); @@ -346,24 +346,24 @@ public class DurableSubscriptionTest ext { Message msg; // Create producer. - AMQConnection con0 = (AMQConnection) getConnection(); + TopicConnection con0 = (TopicConnection) getConnection(); con0.start(); Session session0 = con0.createSession(false, ackMode); - AMQTopic topic = new AMQTopic(con0, MY_TOPIC); + Topic topic = createTopic(con0, MY_TOPIC); Session sessionProd = con0.createSession(false, ackMode); MessageProducer producer = sessionProd.createProducer(topic); // Create consumer 1. - AMQConnection con1 = (AMQConnection) getConnection(); + Connection con1 = getConnection(); con1.start(); Session session1 = con1.createSession(false, ackMode); MessageConsumer consumer1 = session1.createConsumer(topic); // Create consumer 2. - AMQConnection con2 = (AMQConnection) getConnection(); + Connection con2 = getConnection(); con2.start(); Session session2 = con2.createSession(false, ackMode); @@ -459,7 +459,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "MyTestDurableWithInvalidSelectorTopic"); + Topic topic = createTopic(conn, "MyTestDurableWithInvalidSelectorTopic"); MessageProducer producer = session.createProducer(topic); producer.send(session.createTextMessage("testDurableWithInvalidSelector1")); try @@ -496,7 +496,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "testDurableWithInvalidDestinationTopic"); + Topic topic = createTopic(conn, "testDurableWithInvalidDestinationTopic"); try { TopicSubscriber deadSubscriber = session.createDurableSubscriber(null, "testDurableWithInvalidDestinationsub"); @@ -531,7 +531,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "testResubscribeWithChangedSelector"); + Topic topic = createTopic(conn, "testResubscribeWithChangedSelector"); MessageProducer producer = session.createProducer(topic); // Create durable subscriber that matches A @@ -627,7 +627,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(true, Session.SESSION_TRANSACTED); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "sameMessageSelector"); + Topic topic = createTopic(conn, "sameMessageSelector"); //create and register a durable subscriber with a message selector and then close it TopicSubscriber subOne = session.createDurableSubscriber(topic, "sameMessageSelector", "testprop = TRUE", false); @@ -702,7 +702,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "testResubscribeWithChangedSelectorNoClose"); + Topic topic = createTopic(conn, "testResubscribeWithChangedSelectorNoClose"); // Create durable subscriber that matches A TopicSubscriber subA = session.createDurableSubscriber(topic, @@ -774,7 +774,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "subscriptionName"); + Topic topic = createTopic(conn, "subscriptionName"); // create and register a durable subscriber with no message selector TopicSubscriber subOne = session.createDurableSubscriber(topic, "subscriptionName", null, false); @@ -839,7 +839,7 @@ public class DurableSubscriptionTest ext Connection conn = getConnection(); conn.start(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - AMQTopic topic = new AMQTopic((AMQConnection) conn, "subscriptionName"); + Topic topic = createTopic(conn, "subscriptionName"); // create and register a durable subscriber with no message selector session.createDurableSubscriber(topic, "subscriptionName", null, false); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java Thu Nov 24 09:14:51 2016 @@ -20,16 +20,17 @@ */ package org.apache.qpid.test.unit.topic; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - +import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.TopicConnection; import javax.jms.TopicPublisher; import javax.jms.TopicSession; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.test.utils.QpidBrokerTestCase; + /** * @author Apache Software Foundation */ @@ -48,9 +49,9 @@ public class TopicPublisherTest extends public void testUnidentifiedProducer() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con,"MyTopic"); - TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE); + Connection con = getConnection("guest", "guest"); + Topic topic = createTopic(con, "MyTopic"); + TopicSession session1 = ((TopicConnection)con).createTopicSession(false, AMQSession.NO_ACKNOWLEDGE); TopicPublisher publisher = session1.createPublisher(null); MessageConsumer consumer1 = session1.createConsumer(topic); 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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -20,37 +20,36 @@ */ package org.apache.qpid.test.unit.topic; -import javax.jms.JMSException; -import javax.naming.NamingException; -import org.apache.qpid.QpidException; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - import javax.jms.Connection; import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +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; -/** @author Apache Software Foundation */ public class TopicSessionTest extends QpidBrokerTestCase { public void testTopicSubscriptionUnsubscription() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con.getDefaultTopicExchangeName(), "MyTopic"); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); + String topicName = "MyTopic"; + Topic topic = createTopic(con, topicName); TopicSession session1 = con.createTopicSession(true, AMQSession.NO_ACKNOWLEDGE); TopicSubscriber sub = session1.createDurableSubscriber(topic, "subscription0"); TopicPublisher publisher = session1.createPublisher(topic); @@ -64,6 +63,7 @@ public class TopicSessionTest extends Qp tm = (TextMessage) sub.receive(2000); assertNotNull(tm); session1.commit(); + sub.close(); session1.unsubscribe("subscription0"); try @@ -95,11 +95,11 @@ public class TopicSessionTest extends Qp private void subscriptionNameReuseForDifferentTopic(boolean shutdown) throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con, "MyTopic1" + String.valueOf(shutdown)); - AMQTopic topic2 = new AMQTopic(con, "MyOtherTopic1" + String.valueOf(shutdown)); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); + Topic topic = createTopic(con, "MyTopic1" + String.valueOf(shutdown)); + Topic topic2 = createTopic(con, "MyOtherTopic1" + String.valueOf(shutdown)); - TopicSession session1 = con.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); + TopicSession session1 = con.createTopicSession(true, Session.AUTO_ACKNOWLEDGE); TopicSubscriber sub = session1.createDurableSubscriber(topic, "subscription0"); TopicPublisher publisher = session1.createPublisher(null); @@ -115,9 +115,9 @@ public class TopicSessionTest extends Qp { session1.close(); con.close(); - con = (AMQConnection) getConnection("guest", "guest"); + con = (TopicConnection) getConnection("guest", "guest"); con.start(); - session1 = con.createTopicSession(true, AMQSession.NO_ACKNOWLEDGE); + session1 = con.createTopicSession(true, Session.AUTO_ACKNOWLEDGE); publisher = session1.createPublisher(null); } sub.close(); @@ -141,14 +141,14 @@ public class TopicSessionTest extends Qp public void testUnsubscriptionAfterConnectionClose() throws Exception { - AMQConnection con1 = (AMQConnection) getClientConnection("guest", "guest", "clientid"); - AMQTopic topic = new AMQTopic(con1, "MyTopic3"); + TopicConnection con1 = (TopicConnection) getClientConnection("guest", "guest", "clientid"); + Topic topic = createTopic(con1, "MyTopic3"); - TopicSession session1 = con1.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); + TopicSession session1 = con1.createTopicSession(true, Session.AUTO_ACKNOWLEDGE); TopicPublisher publisher = session1.createPublisher(topic); - AMQConnection con2 = (AMQConnection) getClientConnection("guest", "guest", "clientid"); - TopicSession session2 = con2.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); + TopicConnection con2 = (TopicConnection) getClientConnection("guest", "guest", "clientid"); + TopicSession session2 = con2.createTopicSession(true, Session.AUTO_ACKNOWLEDGE); TopicSubscriber sub = session2.createDurableSubscriber(topic, "subscription0"); con2.start(); @@ -161,14 +161,15 @@ public class TopicSessionTest extends Qp con2.close(); publisher.publish(session1.createTextMessage("Hello2")); session1.commit(); - con2 = (AMQConnection) getClientConnection("guest", "guest", "clientid"); - session2 = con2.createTopicSession(true, AMQSession.NO_ACKNOWLEDGE); + con2 = (TopicConnection) getClientConnection("guest", "guest", "clientid"); + session2 = con2.createTopicSession(true,Session.AUTO_ACKNOWLEDGE); sub = session2.createDurableSubscriber(topic, "subscription0"); con2.start(); tm = (TextMessage) sub.receive(2000); session2.commit(); assertNotNull(tm); assertEquals("Hello2", tm.getText()); + sub.close(); session2.unsubscribe("subscription0"); con1.close(); con2.close(); @@ -177,8 +178,8 @@ public class TopicSessionTest extends Qp public void testTextMessageCreation() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con, "MyTopic4"); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); + Topic topic = createTopic(con, "MyTopic4"); TopicSession session1 = con.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); TopicPublisher publisher = session1.createPublisher(topic); MessageConsumer consumer1 = session1.createConsumer(topic); @@ -225,9 +226,9 @@ public class TopicSessionTest extends Qp public void testNoLocal() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con, "testNoLocal"); + Topic topic = createTopic(con, "testNoLocal"); noLocalTest(con, topic); @@ -239,9 +240,9 @@ public class TopicSessionTest extends Qp public void testNoLocalDirectExchange() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic("direct://amq.direct/testNoLocal/testNoLocal?routingkey='testNoLocal',exclusive='true',autodelete='true'"); + Topic topic = createTopicOnDirect(con, "testNoLocal"); noLocalTest(con, topic); @@ -254,9 +255,9 @@ public class TopicSessionTest extends Qp public void testNoLocalFanoutExchange() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); + TopicConnection con = (TopicConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic("fanout://amq.fanout/testNoLocal/testNoLocal?routingkey='testNoLocal',exclusive='true',autodelete='true'"); + Topic topic = createTopicOnFanout(con, "testNoLocal"); noLocalTest(con, topic); @@ -264,7 +265,7 @@ public class TopicSessionTest extends Qp } - private void noLocalTest(AMQConnection con, AMQTopic topic) + private void noLocalTest(TopicConnection con, Topic topic) throws JMSException, URLSyntaxException, QpidException, NamingException { TopicSession session1 = con.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); @@ -322,7 +323,7 @@ public class TopicSessionTest extends Qp m = (TextMessage) noLocal.receive(100); assertNull(m); - AMQConnection con2 = (AMQConnection) getClientConnection("guest", "guest", "foo"); + TopicConnection con2 = (TopicConnection) getClientConnection("guest", "guest", "foo"); TopicSession session2 = con2.createTopicSession(true, AMQSession.AUTO_ACKNOWLEDGE); TopicPublisher publisher2 = session2.createPublisher(topic); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java Thu Nov 24 09:14:51 2016 @@ -30,6 +30,7 @@ import java.util.concurrent.TimeoutExcep import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -46,7 +47,6 @@ import com.google.common.util.concurrent import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.RejectBehaviour; import org.apache.qpid.configuration.ClientProperties; @@ -65,7 +65,7 @@ public class CommitRollbackTest extends private long _positiveTimeout; private long _negativeTimeout; - private AMQConnection _conn; + private Connection _conn; private Session _session; private MessageProducer _publisher; private Session _pubSession; @@ -83,12 +83,13 @@ public class CommitRollbackTest extends private void newConnection() throws Exception { _logger.debug("calling newConnection()"); - _conn = (AMQConnection) getConnection(); + _conn = getConnection(); _session = _conn.createSession(true, Session.SESSION_TRANSACTED); final String queueName = getTestQueueName(); - _jmsQueue = _session.createQueue(queueName); + _jmsQueue = createTestQueue(_session); + _session.commit(); _consumer = _session.createConsumer(_jmsQueue); _pubSession = _conn.createSession(true, Session.SESSION_TRANSACTED); @@ -415,9 +416,11 @@ public class CommitRollbackTest extends { newConnection(); - Queue queue = (Queue) getInitialContext().lookup("queue"); + Queue queue = createTestQueue(_session,"example.queue"); + _session.commit(); + // create a consumer - MessageConsumer cons = _session.createConsumer(queue); + MessageConsumer cons = _session.createConsumer(queue); MessageProducer prod = _session.createProducer(queue); Message message = _session.createTextMessage("Message"); message.setJMSCorrelationID("m1"); @@ -435,7 +438,7 @@ public class CommitRollbackTest extends // Check that the message has been dequeued _session.close(); _conn.close(); - _conn = (AMQConnection) getConnection(); + _conn = getConnection(); _conn.start(); Session session = _conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); cons = session.createConsumer(queue); @@ -528,7 +531,7 @@ public class CommitRollbackTest extends final int rollbackTime = 2000; final int numberOfMessages = 1000; final int numberOfConsumers = 2; - final long testTimeout = numberOfMessages * _positiveTimeout / numberOfConsumers; + final long testTimeout = 60*1000L; sendMessage(_pubSession, _jmsQueue, numberOfMessages); List<ListenableFuture<Void >> consumerFutures = new ArrayList<>(numberOfConsumers); 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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -27,31 +27,29 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import javax.jms.TextMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.jms.Session; import org.apache.qpid.test.utils.QpidBrokerTestCase; public class TransactedTest extends QpidBrokerTestCase { - private AMQQueue queue1; + private Queue queue1; - private AMQConnection con; + private Connection con; private Session session; private MessageConsumer consumer1; private MessageProducer producer2; - private AMQConnection prepCon; + private Connection prepCon; private Session prepSession; private MessageProducer prepProducer1; - private AMQConnection testCon; + private Connection testCon; private Session testSession; private MessageConsumer testConsumer1; private MessageConsumer testConsumer2; @@ -63,14 +61,14 @@ public class TransactedTest extends Qpid { super.setUp(); _logger.info("Create Connection"); - con = (AMQConnection) getConnection("guest", "guest"); + con = getConnection("guest", "guest"); _logger.info("Create Session"); session = con.createSession(true, Session.SESSION_TRANSACTED); _logger.info("Create Q1"); - queue1 = new AMQQueue(session.getDefaultQueueExchangeName(), "Q1", - "Q1", false, true); + queue1 = createTestQueue(session, "Q1"); _logger.info("Create Q2"); - AMQQueue queue2 = new AMQQueue(session.getDefaultQueueExchangeName(), "Q2", false); + Queue queue2 = createTestQueue(session, "Q2"); + session.commit(); _logger.info("Create Consumer of Q1"); consumer1 = session.createConsumer(queue1); @@ -87,10 +85,10 @@ public class TransactedTest extends Qpid con.start(); _logger.info("Create prep connection"); - prepCon = (AMQConnection) getConnection("guest", "guest"); + prepCon = getConnection("guest", "guest"); _logger.info("Create prep session"); - prepSession = prepCon.createSession(false, AMQSession.AUTO_ACKNOWLEDGE); + prepSession = prepCon.createSession(false, Session.AUTO_ACKNOWLEDGE); _logger.info("Create prep producer to Q1"); prepProducer1 = prepSession.createProducer(queue1); @@ -99,9 +97,9 @@ public class TransactedTest extends Qpid prepCon.start(); _logger.info("Create test connection"); - testCon = (AMQConnection) getConnection("guest", "guest"); + testCon = getConnection("guest", "guest"); _logger.info("Create test session"); - testSession = testCon.createSession(false, AMQSession.AUTO_ACKNOWLEDGE); + testSession = testCon.createSession(false, Session.AUTO_ACKNOWLEDGE); _logger.info("Create test consumer of q2"); testConsumer2 = testSession.createConsumer(queue2); } @@ -209,7 +207,7 @@ public class TransactedTest extends Qpid // ensure sent messages are not visible and received messages are requeued expect("RB_A", consumer1.receive(1000), true); expect("RB_B", consumer1.receive(1000), true); - expect("RB_C", consumer1.receive(1000), isBroker010()?false:true); + expect("RB_C", consumer1.receive(1000), (isBroker010()||isBroker10())?false:true); _logger.info("Starting new connection"); testCon.start(); testConsumer1 = testSession.createConsumer(queue1); @@ -226,13 +224,14 @@ public class TransactedTest extends Qpid public void testResendsMsgsAfterSessionClose() throws Exception { - AMQConnection con = (AMQConnection) getConnection("guest", "guest"); + Connection con = getConnection("guest", "guest"); Session consumerSession = con.createSession(true, Session.SESSION_TRANSACTED); - AMQQueue queue3 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), "Q3", false); + Queue queue3 = createTestQueue(session, "Q3"); + session.commit(); MessageConsumer consumer = consumerSession.createConsumer(queue3); - AMQConnection con2 = (AMQConnection) getConnection("guest", "guest"); + Connection con2 = getConnection("guest", "guest"); Session producerSession = con2.createSession(true, Session.SESSION_TRANSACTED); MessageProducer producer = producerSession.createProducer(queue3); @@ -323,7 +322,7 @@ public class TransactedTest extends Qpid public void testCommitOnClosedSession() throws Exception { Connection connnection = getConnection(); - javax.jms.Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); + Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); transactedSession.close(); try { @@ -339,7 +338,7 @@ public class TransactedTest extends Qpid public void testRollbackOnClosedSession() throws Exception { Connection connnection = getConnection(); - javax.jms.Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); + Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); transactedSession.close(); try { @@ -355,7 +354,7 @@ public class TransactedTest extends Qpid public void testGetTransactedOnClosedSession() throws Exception { Connection connnection = getConnection(); - javax.jms.Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); + Session transactedSession = connnection.createSession(true, Session.SESSION_TRANSACTED); transactedSession.close(); try { 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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -21,10 +21,6 @@ package org.apache.qpid.test.unit.xa; -import junit.framework.TestSuite; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javax.jms.Queue; import javax.jms.QueueConnection; import javax.jms.QueueSession; @@ -36,6 +32,10 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import junit.framework.TestSuite; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class FaultTest extends AbstractXATestCase { @@ -114,7 +114,7 @@ public class FaultTest extends AbstractX if (!isBroker08()) { _queue = (Queue) getInitialContext().lookup(QUEUENAME); - _queueFactory = getConnectionFactory(); + _queueFactory = (XAQueueConnectionFactory) getConnectionFactory(); _xaqueueConnection = _queueFactory.createXAQueueConnection("guest", "guest"); XAQueueSession session = _xaqueueConnection.createXAQueueSession(); _queueConnection = _queueFactory.createQueueConnection("guest","guest"); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java Thu Nov 24 09:14:51 2016 @@ -133,7 +133,7 @@ public class QueueTest extends AbstractX // lookup connection factory try { - _queueFactory = getConnectionFactory(); + _queueFactory = (XAQueueConnectionFactory) getConnectionFactory(); } catch (Exception e) { Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java Thu Nov 24 09:14:51 2016 @@ -134,7 +134,7 @@ public class TopicTest extends AbstractX // lookup connection factory try { - _topicFactory = getConnectionFactory(); + _topicFactory = (XATopicConnectionFactory) getConnectionFactory(); } catch (Exception e) { 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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -22,12 +22,12 @@ package org.apache.qpid.test.utils; import java.util.concurrent.CountDownLatch; +import javax.jms.ConnectionFactory; import javax.naming.NamingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.jms.ConnectionListener; public class FailoverBaseCase extends QpidBrokerTestCase implements ConnectionListener @@ -65,7 +65,7 @@ public class FailoverBaseCase extends Qp * @throws Exception */ @Override - public AMQConnectionFactory getConnectionFactory() throws NamingException + public ConnectionFactory getConnectionFactory() throws NamingException { _logger.info("get ConnectionFactory"); if (_connectionFactory == null) 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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016 @@ -41,6 +41,7 @@ import javax.jms.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.client.BrokerDetails; import org.apache.qpid.codec.ClientDecoder; import org.apache.qpid.configuration.ClientProperties; @@ -89,7 +90,7 @@ public class ConnectionEstablishmentTest public void testAuthenticationBypass() throws Exception { String virtualHost = TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST; - ConnectionURL connectionURL = 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/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java Thu Nov 24 09:14:51 2016 @@ -39,6 +39,7 @@ import javax.security.sasl.Sasl; import javax.security.sasl.SaslClient; import javax.security.sasl.SaslException; +import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.client.BrokerDetails; import org.apache.qpid.codec.ClientDecoder; import org.apache.qpid.framing.AMQDataBlock; @@ -87,7 +88,7 @@ public class MaxFrameSizeTest extends Qp { Connection conn = new Connection(); final ConnectionSettings settings = new ConnectionSettings(); - BrokerDetails brokerDetails = getConnectionFactory().getConnectionURL().getAllBrokerDetails().get(0); + BrokerDetails brokerDetails = ((AMQConnectionFactory)getConnectionFactory()).getConnectionURL().getAllBrokerDetails().get(0); settings.setHost(brokerDetails.getHost()); settings.setPort(brokerDetails.getPort()); settings.setUsername(GUEST_USERNAME); @@ -158,7 +159,7 @@ public class MaxFrameSizeTest extends Qp { Connection conn = new Connection(); final ConnectionSettings settings = new ConnectionSettings(); - BrokerDetails brokerDetails = getConnectionFactory().getConnectionURL().getAllBrokerDetails().get(0); + BrokerDetails brokerDetails = ((AMQConnectionFactory)getConnectionFactory()).getConnectionURL().getAllBrokerDetails().get(0); settings.setHost(brokerDetails.getHost()); settings.setPort(brokerDetails.getPort()); settings.setUsername(GUEST_USERNAME); @@ -210,7 +211,7 @@ public class MaxFrameSizeTest extends Qp private void doAMQP08test(int frameSize, ResultEvaluator evaluator) throws NamingException, IOException, AMQFrameDecodingException, AMQProtocolVersionException { - BrokerDetails brokerDetails = getConnectionFactory().getConnectionURL().getAllBrokerDetails().get(0); + BrokerDetails brokerDetails = ((AMQConnectionFactory)getConnectionFactory()).getConnectionURL().getAllBrokerDetails().get(0); Socket socket = new Socket(brokerDetails.getHost(), brokerDetails.getPort()); socket.setTcpNoDelay(true); Added: qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes?rev=1771095&view=auto ============================================================================== --- qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes (added) +++ qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes Thu Nov 24 09:14:51 2016 @@ -0,0 +1,54 @@ + +//----------------------------------------------------- +// Tests which fail, indicating a potential issue or a missing feature +//----------------------------------------------------- + +// Broker side defect - not creating temp queues with prefixes + +org.apache.qpid.client.TemporaryQueuePrefixTest#* + + +// Testing behaviour of changing the topic associated with a durable subscriber + +org.apache.qpid.test.unit.topic.TopicSessionTest#testSubscriptionNameReuseForDifferentTopicSingleConnection +org.apache.qpid.test.unit.topic.TopicSessionTest#testSubscriptionNameReuseForDifferentTopicTwoConnections + + +// somewhere in the process, the expiration time appears to be being modified (or we are only using relative expiration) + +org.apache.qpid.systest.rest.PublishMessageRestTest#testPublishMessageWithPropertiesAndHeaders + + +// the received message is being treated as an object message (because it lacks the necessary JMS annotation?) + +org.apache.qpid.systest.rest.PublishMessageRestTest#testPublishMapMessage + + +// Tests failing waiting for messages - needs investigation + +org.apache.qpid.test.unit.transacted.CommitRollbackTest#testSend2ThenCloseAfter1andTryAgain +org.apache.qpid.test.unit.transacted.CommitRollbackTest#testRollbackSoak + + +// AmqpManagement at the broker level needs the client to support the request/response pattern using local target names +// (since the synthetic virtual host cannot create a temporary queue). This will require the client to support this + +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testCreateQueueOnBrokerManagement +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testCreateBindingOnBrokerManagement +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testCreateConnectionOnBrokerManagement +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testGetTypesOnBrokerManagement +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testCreateVirtualHost +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testQueryBrokerManagement + + +// This test fails with error The underlying correlation-id is not binary and so can't be returned +// however the correlation id in the incoming message was set as byte[] so the issue is within the conversion to +// the InternalMessage and back + +org.apache.qpid.systest.management.amqp.AmqpManagementTest#testGetTypesOnVhostManagement + + +// We are allowed to consume from a temporary queue which should have been deleted +org.apache.qpid.test.unit.client.temporaryqueue.TemporaryQueueTest#testExplictTemporaryQueueDeletion + + Added: qpid/java/trunk/test-profiles/Java10Excludes URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771095&view=auto ============================================================================== --- qpid/java/trunk/test-profiles/Java10Excludes (added) +++ qpid/java/trunk/test-profiles/Java10Excludes Thu Nov 24 09:14:51 2016 @@ -0,0 +1,31 @@ +// Exclude client test of initial context factory, as the 1.0 profile uses the 1.0 context factory +org.apache.qpid.jndi.PropertiesFileInitialContextFactoryTest#* + +// Exclude Address based tests +org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#* +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#* + +// Exclude Tests requiring XA +org.apache.qpid.test.unit.xa.FaultTest#* +org.apache.qpid.test.unit.xa.TopicTest#* +org.apache.qpid.test.unit.xa.QueueTest#* +org.apache.qpid.jms.xa.XAResourceTest#* +org.apache.qpid.ra.QpidRAConnectionTest#* +org.apache.qpid.ra.QpidRAXAResourceTest#* + + +// Exclude tests of AMQP 0-x features +org.apache.qpid.test.client.ImmediateAndMandatoryPublishingTest#* +org.apache.qpid.test.client.CloseOnNoRouteForMandatoryMessageTest#* +org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* + +// Exclude tests of connection URL failover method property +org.apache.qpid.server.failover.FailoverMethodTest#* + +// Testing that the 0-x implementation of a durable topic does not cause queue growth when messages are excluded by selectors +org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesHandledCorrectly + +// These tests explicitly meddle with prefetch - maybe there should be equivalents for AMQP 1.0 +org.apache.qpid.test.unit.transacted.CommitRollbackTest#testRollbackSessionAfterCreditExhausted + + Added: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771095&view=auto ============================================================================== --- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (added) +++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Thu Nov 24 09:14:51 2016 @@ -0,0 +1,123 @@ +// This file should eventually be removed as all the systests are moved to either +// working, defined as broken, or excluded as they test version specific functionality + +org.apache.qpid.server.AbruptClientDisconnectTest#* +org.apache.qpid.server.logging.AccessControlLoggingTest#* +org.apache.qpid.server.logging.AlertingTest#* +org.apache.qpid.server.logging.BindingLoggingTest#* +org.apache.qpid.server.logging.ChannelLoggingTest#* +org.apache.qpid.server.logging.ConnectionLoggingTest#* +org.apache.qpid.server.logging.ConsumerLoggingTest#* +org.apache.qpid.server.logging.DurableQueueLoggingTest#* +org.apache.qpid.server.logging.ExchangeLoggingTest#* +org.apache.qpid.server.logging.QueueLoggingTest#* +org.apache.qpid.server.logging.TransientQueueLoggingTest#* +org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#* +org.apache.qpid.server.security.auth.manager.ExternalAuthenticationTest#* +org.apache.qpid.server.security.auth.manager.MD5AuthenticationManagerTest#* +org.apache.qpid.server.security.auth.mana.ger.ScramSha1AuthenticationManagerTest#* +org.apache.qpid.server.security.auth.manager.ScramSha256AuthenticationManagerTest#* +org.apache.qpid.test.unit.basic.LargeMessageTest#* +org.apache.qpid.test.unit.client.connection.ConnectionStartTest#* +org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#* +org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#* +org.apache.qpid.test.unit.client.QueueSessionFactoryTest#* +org.apache.qpid.test.unit.client.TopicSessionFactoryTest#* +org.apache.qpid.test.unit.topic.TemporaryTopicTest#* +org.apache.qpid.test.client.QueueBrowserAutoAckTest#* +org.apache.qpid.test.client.QueueBrowserClientAckTest#* +org.apache.qpid.test.client.QueueBrowserDupsOkTest#* +org.apache.qpid.test.client.QueueBrowserNoAckTest#* +org.apache.qpid.test.client.QueueBrowserPreAckTest#* +org.apache.qpid.test.client.QueueBrowserTransactedTest#* +org.apache.qpid.client.HeartbeatTest#* +org.apache.qpid.client.message.AMQPEncodedMapMessageTest#* +org.apache.qpid.client.message.JmsObjectMessageTest#* +org.apache.qpid.client.prefetch.PrefetchBehaviourTest#* +org.apache.qpid.client.redelivered.RedeliveredMessageTest#* +org.apache.qpid.client.SynchReceiveTest#* +org.apache.qpid.client.SyncPublishTest#* +org.apache.qpid.client.session.ExchangeDeleteTest#* +org.apache.qpid.client.session.QueueDeclareTest#* +org.apache.qpid.client.session.QueueDeleteTest#* +org.apache.qpid.client.message.JmsObjectMessageTest#* +org.apache.qpid.test.client.failover.FailoverTest#* +org.apache.qpid.test.client.DupsOkTest#* +org.apache.qpid.systest.prefetch.ZeroPrefetchTest#* +org.apache.qpid.systest.messageencryption.MessageEncryptionTest#* +org.apache.qpid.systest.MessageCompressionTest#* +org.apache.qpid.server.SupportedProtocolVersionsTest#* +org.apache.qpid.server.stats.StatisticsReportingTest#* +org.apache.qpid.server.security.acl.ExternalACLTest#* +org.apache.qpid.server.security.acl.ExhaustiveACLTest#* +org.apache.qpid.server.queue.TimeToLiveTest#* +org.apache.qpid.server.queue.SortedQueueTest#* +org.apache.qpid.server.queue.QueueDepthWithSelectorTest#* +org.apache.qpid.server.queue.QueueBindTest#* +org.apache.qpid.server.queue.ProducerFlowControlTest#* +org.apache.qpid.server.queue.PriorityQueueTest#* +org.apache.qpid.server.queue.MultipleTransactedBatchProducerTest#* +org.apache.qpid.server.queue.ModelTest#* +org.apache.qpid.server.queue.MessageGroupQueueTest#* +org.apache.qpid.server.queue.LiveQueueOperationsTest#* +org.apache.qpid.server.queue.LastValueQueueTest#* +org.apache.qpid.server.queue.EnsureNondestructiveConsumersTest#* +org.apache.qpid.server.queue.DefaultFiltersTest#* +org.apache.qpid.server.queue.ConsumerPriorityTest#* +org.apache.qpid.server.queue.ArrivalTimeFilterTest#* +org.apache.qpid.server.message.MessageProtocolConversionTest#* +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#* +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.test.unit.message.StreamMessageTest#* +org.apache.qpid.test.unit.message.JMSPropertiesTest#* +org.apache.qpid.test.unit.close.MessageConsumerCloseTest#* +org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#* +org.apache.qpid.test.unit.client.message.ObjectMessageTest#* +org.apache.qpid.test.unit.client.MaxDeliveryCountTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#* +org.apache.qpid.test.unit.client.connection.ConnectionFactoryTest#* +org.apache.qpid.test.unit.client.connection.BrokerClosesClientConnectionTest#* +org.apache.qpid.test.unit.client.channelclose.CloseWithBlockingReceiveTest#* +org.apache.qpid.test.unit.client.AMQSessionTest#* +org.apache.qpid.test.unit.basic.TextMessageTest#* +org.apache.qpid.test.unit.basic.SessionStartTest#* +org.apache.qpid.test.unit.basic.PubSubTwoConnectionTest#* +org.apache.qpid.test.unit.basic.PropertyValueTest#* +org.apache.qpid.test.unit.basic.ObjectMessageTest#* +org.apache.qpid.test.unit.basic.MultipleConnectionTest#* +org.apache.qpid.test.unit.basic.MapMessageTest#* +org.apache.qpid.test.unit.basic.InvalidDestinationTest#* +org.apache.qpid.test.unit.basic.FieldTableMessageTest#* +org.apache.qpid.test.unit.basic.close.CloseTest#* +org.apache.qpid.test.unit.basic.BytesMessageTest#* +org.apache.qpid.test.unit.ack.RecoverTest#* +org.apache.qpid.test.unit.ack.AcknowledgeTest#* +org.apache.qpid.test.unit.ack.AcknowledgeOnMessageTest#* +org.apache.qpid.test.unit.ack.Acknowledge2ConsumersTest#* +org.apache.qpid.test.client.RollbackOrderTest#* +org.apache.qpid.test.client.queue.LVQTest#* +org.apache.qpid.test.client.message.SelectorTest#* +org.apache.qpid.test.client.message.ObjectMessageTest#* +org.apache.qpid.test.client.message.MessageToStringTest#* +org.apache.qpid.test.client.message.JMSReplyToTest#* +org.apache.qpid.test.client.message.JMSDestinationTest#* +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.systest.rest.ConnectionRestTest#* +org.apache.qpid.systest.rest.MessagesRestTest#* +org.apache.qpid.transport.ProtocolNegotiationTest#* +org.apache.qpid.transport.MaxFrameSizeTest#* +org.apache.qpid.transport.ConnectionEstablishmentTest#* +org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#* +org.apache.qpid.client.failover.FailoverBehaviourTest#* +org.apache.qpid.client.failover.MultipleBrokersFailoverTest#* +org.apache.qpid.test.unit.transacted.TransactionTimeoutDisabledTest#* +org.apache.qpid.test.unit.topic.TopicPublisherTest#* +org.apache.qpid.test.client.message.JMSXUserIDTest#* +org.apache.qpid.systest.disttest.endtoend.EndToEndTest#* +org.apache.qpid.systest.disttest.QpidQueueCreatorTest#* + + + + + + Added: qpid/java/trunk/test-profiles/test-provider-1-0.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/test-provider-1-0.properties?rev=1771095&view=auto ============================================================================== --- qpid/java/trunk/test-profiles/test-provider-1-0.properties (added) +++ qpid/java/trunk/test-profiles/test-provider-1-0.properties Thu Nov 24 09:14:51 2016 @@ -0,0 +1,41 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + +# Copied from default.testprofile +test.port=0 +test.port.ssl=0 +test.port.alt=0 +test.port.alt.ssl=0 + +java.naming.factory.initial = org.apache.qpid.jms.jndi.JmsInitialContextFactory + +# The actual factory URIs are set in QpidBrokerTestCase +connectionfactory.default=amqp://localhost:5672 +connectionfactory.failover=amqp://localhost:5672 + + +queue.MyQueue = example.MyQueue +queue.queue = example.queue +queue.xaQueue = xaQueue + +topic.topic = topic +topic.xaTopic = xaTopic +topic.durableSubscriberTopic = durableSubscriberTopic Propchange: qpid/java/trunk/test-profiles/test-provider-1-0.properties ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
