You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2015/12/17 13:59:45 UTC
svn commit: r1720539 [3/5] - in /qpid/java/trunk: ./
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/systests/src/test/java/org/apache/qpid/server/store/b...
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java Thu Dec 17 12:59:43 2015
@@ -45,14 +45,14 @@ public class HeartbeatTest extends QpidB
{
if (getName().equals("testHeartbeatsEnabledBrokerSide"))
{
- getBrokerConfiguration().setBrokerAttribute(Broker.CONNECTION_HEART_BEAT_DELAY, "1");
+ getDefaultBrokerConfiguration().setBrokerAttribute(Broker.CONNECTION_HEART_BEAT_DELAY, "1");
}
super.setUp();
}
public void testHeartbeatsEnabledUsingUrl() throws Exception
{
- final String url = String.format(CONNECTION_URL_WITH_HEARTBEAT, DEFAULT_PORT, 1);
+ final String url = String.format(CONNECTION_URL_WITH_HEARTBEAT, getDefaultBroker().getAmqpPort(), 1);
AMQConnection conn = (AMQConnection) getConnection(new AMQConnectionURL(url));
conn.setHeartbeatListener(_listener);
conn.start();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Thu Dec 17 12:59:43 2015
@@ -18,27 +18,18 @@
*/
package org.apache.qpid.client.failover;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.BrokerDetails;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.jms.FailoverPolicy;
-import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.systest.rest.RestTestHelper;
-import org.apache.qpid.test.utils.FailoverBaseCase;
-import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.test.utils.TestUtils;
-import org.apache.qpid.url.URLSyntaxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -56,24 +47,25 @@ import javax.jms.TextMessage;
import javax.jms.TransactionRolledBackException;
import javax.naming.NamingException;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.QpidException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.BrokerDetails;
+import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.jms.FailoverPolicy;
+import org.apache.qpid.test.utils.FailoverBaseCase;
+import org.apache.qpid.url.URLSyntaxException;
/**
* Test suite to test all possible failover corner cases
*/
-public class FailoverBehaviourTest extends FailoverBaseCase implements ConnectionListener, ExceptionListener
+public class FailoverBehaviourTest extends FailoverBaseCase implements ExceptionListener
{
protected static final Logger _LOGGER = LoggerFactory.getLogger(FailoverBehaviourTest.class);
@@ -92,12 +84,6 @@ public class FailoverBehaviourTest exten
protected Connection _connection;
/**
- * Failover completion latch is used to wait till connectivity to broker is
- * restored
- */
- private CountDownLatch _failoverComplete;
-
- /**
* Consumer session
*/
private Session _consumerSession;
@@ -127,11 +113,6 @@ public class FailoverBehaviourTest exten
*/
private JMSException _exceptionListenerException;
- /**
- * Latch to check that failover mutex is hold by a failover thread
- */
- private CountDownLatch _failoverStarted;
-
@Override
protected void setUp() throws Exception
{
@@ -140,8 +121,6 @@ public class FailoverBehaviourTest exten
_connection = getConnection();
_connection.setExceptionListener(this);
((AMQConnection) _connection).setConnectionListener(this);
- _failoverComplete = new CountDownLatch(1);
- _failoverStarted = new CountDownLatch(1);
}
/**
@@ -735,7 +714,7 @@ public class FailoverBehaviourTest exten
doFailoverWhilstPublishingInFlight(false);
}
- private void doFailoverWhilstPublishingInFlight(boolean hardKill) throws JMSException, InterruptedException
+ private void doFailoverWhilstPublishingInFlight(boolean hardKill) throws Exception
{
init(Session.SESSION_TRANSACTED, false);
@@ -802,12 +781,12 @@ public class FailoverBehaviourTest exten
if (hardKill)
{
_logger.debug("Killing the Broker");
- killBroker(getFailingPort());
+ killDefaultBroker();
}
else
{
_logger.debug("Stopping the Broker");
- stopBroker(getFailingPort());
+ stopDefaultBroker();
}
if (exception.get() != null)
@@ -833,7 +812,7 @@ public class FailoverBehaviourTest exten
String text = MessageFormat.format(TEST_MESSAGE_FORMAT, 0);
Message message = _producerSession.createTextMessage(text);
- failBroker(getFailingPort());
+ failDefaultBroker();
if(!_failoverStarted.await(5, TimeUnit.SECONDS))
{
@@ -866,7 +845,7 @@ public class FailoverBehaviourTest exten
// proceeding before we try to send the message
synchronized(connection.getFailoverMutex())
{
- failBroker(getFailingPort());
+ failDefaultBroker();
// wait to make sure that connection is lost
while(!connection.isFailingOver())
@@ -904,8 +883,8 @@ public class FailoverBehaviourTest exten
// holding failover mutex should prevent the failover from proceeding
synchronized(connection.getFailoverMutex())
{
- killBroker();
- startBroker();
+ killDefaultBroker();
+ startDefaultBroker();
// sleep interval exceeds failover timeout interval
Thread.sleep(11000l);
@@ -937,8 +916,8 @@ public class FailoverBehaviourTest exten
// holding failover mutex should prevent the failover from proceeding
synchronized(connection.getFailoverMutex())
{
- killBroker();
- startBroker();
+ killDefaultBroker();
+ startDefaultBroker();
}
// allows the failover thread to proceed
@@ -1016,8 +995,8 @@ public class FailoverBehaviourTest exten
final int currentCounter = counter.get();
assertTrue("Unexpected number of sent messages:" + currentCounter, currentCounter >=3);
- killBroker();
- startBroker();
+ killDefaultBroker();
+ startDefaultBroker();
// allows the failover thread to proceed
Thread.yield();
@@ -1068,7 +1047,7 @@ public class FailoverBehaviourTest exten
{
stopFlag.countDown();
- failBroker(getFailingPort());
+ failDefaultBroker();
}
}
@@ -1154,7 +1133,7 @@ public class FailoverBehaviourTest exten
Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
assertNotNull("Session should be created", session);
- killBroker();
+ killDefaultBroker();
boolean failingOver = failoverBegun.await(5000, TimeUnit.MILLISECONDS);
assertTrue("Failover did not begin with a reasonable time", failingOver);
@@ -1164,99 +1143,6 @@ public class FailoverBehaviourTest exten
assertTrue("Failover policy is unexpectedly exhausted", connection.getFailoverPolicy().failoverAllowed());
}
-
-
- private int getUnacknowledgedMessageNumber(int testMessageNumber) throws IOException, InterruptedException
- {
- int unacknowledgedMessageNumber = 0;
- int i =0;
- do
- {
- unacknowledgedMessageNumber = getUnacknowledgedMessageNumber();
- if (unacknowledgedMessageNumber != testMessageNumber)
- {
- Thread.sleep(50);
- }
- else
- {
- break;
- }
- }
- while (i++ < 20);
- return unacknowledgedMessageNumber;
- }
-
- private void configureHttpManagement()
- {
- TestBrokerConfiguration config = getBrokerConfiguration();
- config.addHttpManagementConfiguration();
- String initialConfiguration = System.getProperty("virtualhostnode.context.blueprint");
- if (initialConfiguration != null)
- {
- config.setObjectAttribute(VirtualHostNode.class, "test", VirtualHostNode.VIRTUALHOST_INITIAL_CONFIGURATION, initialConfiguration);
- }
- config.setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER,
- "secureOnlyMechanisms",
- "{}");
-
-
- // set password authentication provider on http port for the tests
- config.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER,
- TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
- config.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
- config.setSaved(false);
- }
-
- private void closeConnectionViaManagement() throws IOException
- {
- RestTestHelper restTestHelper = new RestTestHelper(getHttpManagementPort(getPort(0)));
- try
- {
- restTestHelper.setUsernameAndPassword("webadmin", "webadmin");
- List<Map<String, Object>> connections = restTestHelper.getJsonAsList("virtualhost/test/test/getConnections");
- assertEquals("Unexpected number of connections", 1, connections.size());
- Map<String, Object> connection = connections.get(0);
- String connectionName = (String) connection.get(org.apache.qpid.server.model.Connection.NAME);
- restTestHelper.submitRequest("connection/" + TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT + "/" + restTestHelper.encodeAsUTF( connectionName ), "DELETE", 200);
- }
- finally
- {
- restTestHelper.tearDown();
- }
- }
-
- private int getUnacknowledgedMessageNumber() throws IOException
- {
- RestTestHelper restTestHelper = new RestTestHelper(getHttpManagementPort(getPort(0)));
- try
- {
- restTestHelper.setUsernameAndPassword("webadmin", "webadmin");
- List<Map<String, Object>> sessions = restTestHelper.getJsonAsList("session");
- for(Map<String, Object> session: sessions )
- {
- List<Map<String, Object>> consumers = (List<Map<String, Object>>)session.get("consumers");
- if (consumers != null)
- {
- Map<String, Object> consumer = consumers.get(0);
- Map<String, Object> stat = (Map<String, Object>)consumer.get("statistics");
- if (stat != null)
- {
- Number unacknowledgedMessages = (Number)stat.get("unacknowledgedMessages");
- if (unacknowledgedMessages != null)
- {
- return unacknowledgedMessages.intValue();
- }
- }
- }
- }
- return 0;
- }
- finally
- {
- restTestHelper.tearDown();
- }
- }
-
private Queue createAndBindQueueWithFlowControlEnabled(Session session, String queueName, int capacity, int resumeCapacity) throws Exception
{
final Map<String, Object> arguments = new HashMap<String, Object>();
@@ -1508,21 +1394,19 @@ public class FailoverBehaviourTest exten
*/
private void causeFailure()
{
- causeFailure(getFailingPort(), DEFAULT_FAILOVER_TIME * 2);
+ causeFailure(DEFAULT_FAILOVER_TIME * 2);
}
/**
- * Causes failover by stopping broker on given port and waits till
+ * Causes failover by stopping broker and waits till
* connection is re-established during given time interval.
*
- * @param port
- * broker port
* @param delay
* time interval to wait for connection re-establishement
*/
- private void causeFailure(int port, long delay)
+ private void causeFailure(long delay)
{
- failBroker(port);
+ failDefaultBroker();
awaitForFailoverCompletion(delay);
}
@@ -1549,34 +1433,6 @@ public class FailoverBehaviourTest exten
// along with error code and/or expected exception type
}
- @Override
- public void bytesSent(long count)
- {
- }
-
- @Override
- public void bytesReceived(long count)
- {
- }
-
- @Override
- public boolean preFailover(boolean redirect)
- {
- _failoverStarted.countDown();
- return true;
- }
-
- @Override
- public boolean preResubscribe()
- {
- return true;
- }
-
- @Override
- public void failoverComplete()
- {
- _failoverComplete.countDown();
- }
@Override
public void onException(JMSException e)
@@ -1680,7 +1536,7 @@ public class FailoverBehaviourTest exten
Message receivedMessage = _consumer.receive(1000l);
assertReceivedMessage(receivedMessage, TEST_MESSAGE_FORMAT, 0);
- failBroker(getFailingPort());
+ failDefaultBroker();
// wait until failover is started
_failoverStarted.await(5, TimeUnit.SECONDS);
@@ -1736,7 +1592,7 @@ public class FailoverBehaviourTest exten
Message receivedMessage = (Message) messages.nextElement();
assertReceivedMessage(receivedMessage, TEST_MESSAGE_FORMAT, 0);
- failBroker(getFailingPort());
+ failDefaultBroker();
// wait until failover is started
_failoverStarted.await(5, TimeUnit.SECONDS);
@@ -1772,11 +1628,4 @@ public class FailoverBehaviourTest exten
((AMQConnection) _connection).setFailoverPolicy(failoverPolicy);
return failoverPolicy;
}
-
- @Override
- public void failBroker(int port)
- {
- killBroker(port);
- }
-
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java Thu Dec 17 12:59:43 2015
@@ -39,9 +39,17 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.test.utils.BrokerHolder;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.util.FileUtils;
+/*
+ * we need to create 4 brokers:
+ * 1st broker will be running in test JVM and will not have failover host (only tcp connection will established, amqp connection will be closed)
+ * 2d broker will be spawn in separate JVM and should have a failover host (amqp connection should be established)
+ * 3d broker will be spawn in separate JVM and should not have a failover host (only tcp connection will established, amqp connection will be closed)
+ * 4d broker will be spawn in separate JVM and should have a failover host (amqp connection should be established)
+ */
public class MultipleBrokersFailoverTest extends QpidBrokerTestCase implements ConnectionListener
{
private static final Logger _logger = LoggerFactory.getLogger(MultipleBrokersFailoverTest.class);
@@ -52,9 +60,9 @@ public class MultipleBrokersFailoverTest
private static final int FAILOVER_RETRIES = 0;
private static final int FAILOVER_CONNECTDELAY = 0;
private static final int FAILOVER_AWAIT_TIME = 10000;
+ private static final int NUMBER_OF_BROKERS = 4;
-
- private int[] _brokerPorts;
+ private BrokerHolder[] _brokerHolders;
private AMQConnectionURL _connectionURL;
private Connection _connection;
private CountDownLatch _failoverComplete;
@@ -66,33 +74,24 @@ public class MultipleBrokersFailoverTest
private MessageProducer _producer;
@Override
+ public void startDefaultBroker()
+ {
+ // do not start the default broker for this test
+ }
+
+ @Override
protected void setUp() throws Exception
{
super.setUp();
- int numBrokers = 4;
- int port = getPort();
- _brokerPorts = new int[numBrokers];
-
- // we need to create 4 brokers:
- // 1st broker will be running in test JVM and will not have failover host (only tcp connection will established, amqp connection will be closed)
- // 2d broker will be spawn in separate JVM and should have a failover host (amqp connection should be established)
- // 3d broker will be spawn in separate JVM and should not have a failover host (only tcp connection will established, amqp connection will be closed)
- // 4d broker will be spawn in separate JVM and should have a failover host (amqp connection should be established)
+ _brokerHolders = new BrokerHolder[NUMBER_OF_BROKERS];
// the test should connect to the second broker first and fail over to the forth broker
// after unsuccessful try to establish the connection to the 3d broker
- for (int i = 0; i < numBrokers; i++)
+ for (int i = 0; i < NUMBER_OF_BROKERS; i++)
{
- if (i > 0)
- {
- port = getNextAvailable(port + 1);
- }
- _brokerPorts[i] = port;
-
- createBrokerConfiguration(port);
String host = null;
- if (i == 1 || i == _brokerPorts.length - 1)
+ if (i == 1 || i == NUMBER_OF_BROKERS - 1)
{
host = FAILOVER_VIRTUAL_HOST;
}
@@ -100,13 +99,17 @@ public class MultipleBrokersFailoverTest
{
host = NON_FAILOVER_VIRTUAL_HOST;
}
- createTestVirtualHostNode(port, host);
- startBroker(port);
+ BrokerHolder brokerHolder = createSpawnedBroker();
+ createTestVirtualHostNode(brokerHolder, host, true);
+ brokerHolder.start();
+
+ _brokerHolders[i] = brokerHolder;
+
revertSystemProperties();
}
- _connectionURL = new AMQConnectionURL(generateUrlString(numBrokers));
+ _connectionURL = new AMQConnectionURL(generateUrlString(NUMBER_OF_BROKERS));
_connection = getConnection(_connectionURL);
((AMQConnection) _connection).setConnectionListener(this);
@@ -114,11 +117,6 @@ public class MultipleBrokersFailoverTest
_failoverStarted = new CountDownLatch(1);
}
- public void startBroker() throws Exception
- {
- // noop, prevent the broker startup in super.setUp()
- }
-
private String generateUrlString(int numBrokers)
{
String baseString = "amqp://guest:guest@test/" + FAILOVER_VIRTUAL_HOST
@@ -132,7 +130,7 @@ public class MultipleBrokersFailoverTest
buffer.append(";");
}
- String broker = String.format(BROKER_PORTION_FORMAT, _brokerPorts[i],
+ String broker = String.format(BROKER_PORTION_FORMAT, _brokerHolders[i].getAmqpPort(),
FAILOVER_CONNECTDELAY, FAILOVER_RETRIES);
buffer.append(broker);
}
@@ -141,6 +139,7 @@ public class MultipleBrokersFailoverTest
return buffer.toString();
}
+ @Override
public void tearDown() throws Exception
{
try
@@ -149,15 +148,10 @@ public class MultipleBrokersFailoverTest
}
finally
{
- for (int i = 0; i < _brokerPorts.length; i++)
+ for (BrokerHolder broker : _brokerHolders)
{
- if (_brokerPorts[i] > 0)
- {
- stopBrokerSafely(_brokerPorts[i]);
- FileUtils.deleteDirectory(System.getProperty("QPID_WORK") + File.separator + getFailingPort());
- }
+ stopBrokerSafely(broker);
}
-
}
}
@@ -165,33 +159,33 @@ public class MultipleBrokersFailoverTest
public void testFailoverOnBrokerKill() throws Exception
{
init(Session.SESSION_TRANSACTED, true);
- assertConnectionPort(_brokerPorts[1]);
+ assertConnectionPort(_brokerHolders[1].getAmqpPort());
assertSendReceive(0);
- killBroker(_brokerPorts[1]);
+ _brokerHolders[1].kill();
awaitForFailoverCompletion(FAILOVER_AWAIT_TIME);
assertEquals("Failover is not started as expected", 0, _failoverStarted.getCount());
assertSendReceive(2);
- assertConnectionPort(_brokerPorts[_brokerPorts.length - 1]);
+ assertConnectionPort(_brokerHolders[NUMBER_OF_BROKERS - 1].getAmqpPort());
}
public void testFailoverOnBrokerStop() throws Exception
{
init(Session.SESSION_TRANSACTED, true);
- assertConnectionPort(_brokerPorts[1]);
+ assertConnectionPort(_brokerHolders[1].getAmqpPort());
assertSendReceive(0);
- stopBroker(_brokerPorts[1]);
+ _brokerHolders[1].shutdown();
awaitForFailoverCompletion(FAILOVER_AWAIT_TIME);
assertEquals("Failover is not started as expected", 0, _failoverStarted.getCount());
assertSendReceive(1);
- assertConnectionPort(_brokerPorts[_brokerPorts.length - 1]);
+ assertConnectionPort(_brokerHolders[NUMBER_OF_BROKERS - 1].getAmqpPort());
}
private void assertConnectionPort(int brokerPort)
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java Thu Dec 17 12:59:43 2015
@@ -72,8 +72,13 @@ public class SSLTest extends QpidBrokerT
setSslStoreSystemProperties();
- //We dont call super.setUp, the tests start the broker after deciding
- //whether to run and then configuring it appropriately
+ super.setUp();
+ }
+
+ @Override
+ public void startDefaultBroker() throws Exception
+ {
+ // noop; we do not need to start broker in setUp
}
public void testCreateSSLConnectionUsingConnectionURLParams() throws Exception
@@ -84,7 +89,7 @@ public class SSLTest extends QpidBrokerT
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true'" +
@@ -92,7 +97,7 @@ public class SSLTest extends QpidBrokerT
"&trust_store='%s'&trust_store_password='%s'" +
"'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(),
KEYSTORE,KEYSTORE_PASSWORD,TRUSTSTORE,TRUSTSTORE_PASSWORD);
Connection con = getConnection(new AMQConnectionURL(url));
@@ -110,7 +115,7 @@ public class SSLTest extends QpidBrokerT
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, false, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true'" +
@@ -118,7 +123,7 @@ public class SSLTest extends QpidBrokerT
"'";
File trustCertFile = extractCertFileFromTestTrustStore();
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(),
trustCertFile.getCanonicalPath());
Connection con = getConnection(new AMQConnectionURL(url));
@@ -132,12 +137,12 @@ public class SSLTest extends QpidBrokerT
{
if (shouldPerformTest())
{
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true''";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_PORT);
+ url = String.format(url, getDefaultBroker().getAmqpPort());
try
{
@@ -161,7 +166,7 @@ public class SSLTest extends QpidBrokerT
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://127.0.0.1:%s" +
"?ssl='true'" +
@@ -169,7 +174,7 @@ public class SSLTest extends QpidBrokerT
"&trust_store='%s'&trust_store_password='%s'" +
"'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(),
KEYSTORE,KEYSTORE_PASSWORD,TRUSTSTORE,TRUSTSTORE_PASSWORD);
try
@@ -187,7 +192,7 @@ public class SSLTest extends QpidBrokerT
"&key_store='%s'&key_store_password='%s'" +
"&trust_store='%s'&trust_store_password='%s'" +
"'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(),
KEYSTORE,KEYSTORE_PASSWORD,TRUSTSTORE,TRUSTSTORE_PASSWORD);
Connection con = getConnection(new AMQConnectionURL(url));
@@ -208,11 +213,11 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
//Create URL enabling SSL at the connection rather than brokerlist level
String url = "amqp://guest:guest@test/?ssl='true'&brokerlist='tcp://localhost:%s'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort());
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should be successful", con);
@@ -232,11 +237,11 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
//Create URL enabling SSL at the connection, overriding the false at the brokerlist level
String url = "amqp://guest:guest@test/?ssl='true'&brokerlist='tcp://localhost:%s?ssl='false''";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort());
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should be successful", con);
@@ -251,11 +256,11 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s?ssl='true''";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort());
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should be successful", con);
@@ -270,11 +275,11 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:" +
- QpidBrokerTestCase.DEFAULT_SSL_PORT +
- "?ssl='true'&ssl_cert_alias='" + CERT_ALIAS_APP1 + "''";
+ getDefaultBroker().getAmqpTlsPort() +
+ "?ssl='true'&ssl_cert_alias='" + CERT_ALIAS_APP1 + "''";
AMQTestConnection_0_10 con = new AMQTestConnection_0_10(url);
org.apache.qpid.transport.Connection transportCon = con.getConnection();
@@ -283,8 +288,8 @@ public class SSLTest extends QpidBrokerT
con.close();
url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:" +
- QpidBrokerTestCase.DEFAULT_SSL_PORT +
- "?ssl='true'&ssl_cert_alias='" + CERT_ALIAS_APP2 + "''";
+ getDefaultBroker().getAmqpTlsPort() +
+ "?ssl='true'&ssl_cert_alias='" + CERT_ALIAS_APP2 + "''";
con = new AMQTestConnection_0_10(url);
transportCon = con.getConnection();
@@ -300,11 +305,10 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (WANTing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, false, true, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://127.0.0.1:" +
- QpidBrokerTestCase.DEFAULT_SSL_PORT +
- "?ssl='true''";
+ getDefaultBroker().getAmqpTlsPort() + "?ssl='true''";
try
{
@@ -334,11 +338,10 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (WANTing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, false, true, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:" +
- QpidBrokerTestCase.DEFAULT_SSL_PORT +
- "?ssl='true''";
+ getDefaultBroker().getAmqpTlsPort() + "?ssl='true''";
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should have been created", con);
@@ -351,11 +354,10 @@ public class SSLTest extends QpidBrokerT
{
//Start the broker (WANTing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, false, true, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost.localdomain:" +
- QpidBrokerTestCase.DEFAULT_SSL_PORT +
- "?ssl='true''";
+ getDefaultBroker().getAmqpTlsPort() + "?ssl='true''";
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should have been created", con);
@@ -370,7 +372,7 @@ public class SSLTest extends QpidBrokerT
//Start the broker (WANTing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, false, true, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
@@ -378,7 +380,7 @@ public class SSLTest extends QpidBrokerT
"&trust_store='%s'&trust_store_password='%s'" +
"'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT, TRUSTSTORE,TRUSTSTORE_PASSWORD);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(), TRUSTSTORE, TRUSTSTORE_PASSWORD);
Connection con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should be successful", con);
@@ -423,12 +425,12 @@ public class SSLTest extends QpidBrokerT
//Start the broker
configureJavaBrokerIfNecessary(true, true, needClientCerts, wantClientCerts, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true'&trust_store='%s'&trust_store_password='%s''";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,TRUSTSTORE,TRUSTSTORE_PASSWORD);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(), TRUSTSTORE, TRUSTSTORE_PASSWORD);
try
{
Connection con = getConnection(new AMQConnectionURL(url));
@@ -470,7 +472,7 @@ public class SSLTest extends QpidBrokerT
//Start the broker (NEEDing client certificate authentication)
configureJavaBrokerIfNecessary(true, false, false, false, true);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
"?ssl='true'&ssl_verify_hostname='true'" +
@@ -478,7 +480,7 @@ public class SSLTest extends QpidBrokerT
"&trust_store='%s'&trust_store_password='%s'" +
"'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT,
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(),
KEYSTORE,KEYSTORE_PASSWORD,TRUSTSTORE,TRUSTSTORE_PASSWORD);
Connection con = getConnection(new AMQConnectionURL(url));
@@ -488,7 +490,7 @@ public class SSLTest extends QpidBrokerT
url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s'";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT);
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort());
con = getConnection(new AMQConnectionURL(url));
assertNotNull("connection should be successful", con);
@@ -506,7 +508,7 @@ public class SSLTest extends QpidBrokerT
File[] certAndKeyFiles = extractResourcesFromTestKeyStore();
//Start the broker (WANTing client certificate authentication)
configureJavaBrokerIfNecessary(true, true, true, false, false);
- super.setUp();
+ super.startDefaultBroker();
String url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:%s" +
@@ -514,7 +516,8 @@ public class SSLTest extends QpidBrokerT
"&trust_store='%s'&ssl_verify_hostname='false'&trust_store_password='%s'" +
"&client_cert_path='%s'&client_cert_priv_key_path='%s''";
- url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT, TRUSTSTORE,TRUSTSTORE_PASSWORD, certAndKeyFiles[1].getCanonicalPath(), certAndKeyFiles[0].getCanonicalPath());
+ url = String.format(url, getDefaultBroker().getAmqpTlsPort(), TRUSTSTORE, TRUSTSTORE_PASSWORD,
+ certAndKeyFiles[1].getCanonicalPath(), certAndKeyFiles[0].getCanonicalPath());
final AMQConnectionURL connectionURL = new AMQConnectionURL(url);
Connection con = getConnection(connectionURL);
@@ -553,17 +556,17 @@ public class SSLTest extends QpidBrokerT
sslPortAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
sslPortAttributes.put(Port.TRUST_STORES, Collections.singleton(TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE));
sslPortAttributes.put(Port.PROTOCOLS, System.getProperty(TEST_AMQP_PORT_PROTOCOLS_PROPERTY));
- getBrokerConfiguration().addObjectConfiguration(Port.class,sslPortAttributes);
+ getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, sslPortAttributes);
Map<String, Object> aliasAttributes = new HashMap<>();
aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias");
aliasAttributes.put(VirtualHostAlias.TYPE, DefaultVirtualHostAlias.TYPE_NAME);
- getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+ getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
aliasAttributes = new HashMap<>();
aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias");
aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME);
- getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+ getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java Thu Dec 17 12:59:43 2015
@@ -20,18 +20,18 @@
*/
package org.apache.qpid.jms.xa;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.util.FileUtils;
-import org.apache.qpid.test.unit.xa.AbstractXATestCase;
-import org.apache.qpid.client.AMQXAResource;
-
import javax.jms.XAConnection;
import javax.jms.XAConnectionFactory;
import javax.jms.XASession;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQXAResource;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.test.unit.xa.AbstractXATestCase;
+import org.apache.qpid.test.utils.BrokerHolder;
+
public class XAResourceTest extends AbstractXATestCase
{
@@ -109,46 +109,41 @@ public class XAResourceTest extends Abst
*/
public void testIsSameRMMultiCF() throws Exception
{
- startBroker(FAILING_PORT);
- ConnectionURL url = getConnectionFactory(FACTORY_NAME).getConnectionURL();
- XAConnectionFactory factory = new AMQConnectionFactory(url);
- XAConnectionFactory factory2 = new AMQConnectionFactory(url);
- XAConnectionFactory factory3 = getConnectionFactory(ALT_FACTORY_NAME);
-
- XAConnection conn = factory.createXAConnection("guest","guest");
- XAConnection conn2 = factory2.createXAConnection("guest","guest");
- XAConnection conn3 = factory3.createXAConnection("guest","guest");
-
- XASession session = conn.createXASession();
- XASession session2 = conn2.createXASession();
- XASession session3 = conn3.createXASession();
-
- XAResource xaResource1 = session.getXAResource();
- XAResource xaResource2 = session2.getXAResource();
- XAResource xaResource3 = session3.getXAResource();
-
- assertFalse("XAResource objects should not be equal", xaResource1.equals(xaResource2));
- assertTrue("isSameRM not true for identical objects", xaResource1.isSameRM(xaResource2));
- assertFalse("isSameRM true for XA Resources created by two different brokers", xaResource1.isSameRM(xaResource3));
-
- conn.close();
- conn2.close();
- conn3.close();
- }
-
- @Override
- public void tearDown() throws Exception
- {
+ BrokerHolder secondBroker = createSpawnedBroker();
try
{
- super.tearDown();
+ secondBroker.start();
+ setTestSystemProperty("test.port.alt", String.valueOf(secondBroker.getAmqpPort()));
+
+ ConnectionURL url = getConnectionFactory(FACTORY_NAME).getConnectionURL();
+ XAConnectionFactory factory = new AMQConnectionFactory(url);
+ XAConnectionFactory factory2 = new AMQConnectionFactory(url);
+ XAConnectionFactory factory3 = getConnectionFactory(ALT_FACTORY_NAME);
+
+ XAConnection conn = factory.createXAConnection("guest", "guest");
+ XAConnection conn2 = factory2.createXAConnection("guest", "guest");
+ XAConnection conn3 = factory3.createXAConnection("guest", "guest");
+
+ XASession session = conn.createXASession();
+ XASession session2 = conn2.createXASession();
+ XASession session3 = conn3.createXASession();
+
+ XAResource xaResource1 = session.getXAResource();
+ XAResource xaResource2 = session2.getXAResource();
+ XAResource xaResource3 = session3.getXAResource();
+
+ assertFalse("XAResource objects should not be equal", xaResource1.equals(xaResource2));
+ assertTrue("isSameRM not true for identical objects", xaResource1.isSameRM(xaResource2));
+ assertFalse("isSameRM true for XA Resources created by two different brokers",
+ xaResource1.isSameRM(xaResource3));
+
+ conn.close();
+ conn2.close();
+ conn3.close();
}
finally
{
- // Ensure we shutdown any secondary brokers
- stopBroker(FAILING_PORT);
- FileUtils.deleteDirectory(System.getProperty("QPID_WORK") + "/" + getFailingPort());
+ secondBroker.shutdown();
}
}
-
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java Thu Dec 17 12:59:43 2015
@@ -34,15 +34,13 @@ public class QpidRAConnectionTest extend
{
private static final Logger _logger = LoggerFactory.getLogger(QpidRAConnectionTest.class);
- private static final String BROKER_PORT = "15672";
-
- private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%25252520CRAM-MD5''";
+ private static final String URL_TEMPLATE = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:%d?sasl_mechs='PLAIN%%25252520CRAM-MD5''";
public void testSessionCommitOnClosedConnectionThrowsException() throws Exception
{
QpidResourceAdapter ra = new QpidResourceAdapter();
QpidRAManagedConnectionFactory mcf = new QpidRAManagedConnectionFactory();
- mcf.setConnectionURL(URL);
+ mcf.setConnectionURL(getBrokerUrl());
mcf.setResourceAdapter(ra);
ConnectionFactory cf = new QpidRAConnectionFactoryImpl(mcf, null);
Connection c = cf.createConnection();
@@ -66,7 +64,7 @@ public class QpidRAConnectionTest extend
{
QpidResourceAdapter ra = new QpidResourceAdapter();
QpidRAManagedConnectionFactory mcf = new QpidRAManagedConnectionFactory();
- mcf.setConnectionURL(URL);
+ mcf.setConnectionURL(getBrokerUrl());
mcf.setResourceAdapter(ra);
ConnectionFactory cf = new QpidRAConnectionFactoryImpl(mcf, null);
Connection c = cf.createConnection();
@@ -87,4 +85,9 @@ public class QpidRAConnectionTest extend
c.close();
}
}
+
+ private String getBrokerUrl()
+ {
+ return String.format(URL_TEMPLATE, getDefaultBroker().getAmqpPort());
+ }
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java Thu Dec 17 12:59:43 2015
@@ -30,14 +30,13 @@ import org.apache.qpid.test.utils.QpidBr
public class QpidRAXAResourceTest extends QpidBrokerTestCase
{
private static final String FACTORY_NAME = "default";
- private static final String BROKER_PORT = "15672";
- private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%2520CRAM-MD5''";
+ private static final String URL_TEMPLATE = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:%d?sasl_mechs='PLAIN%%2520CRAM-MD5''";
public void testXAResourceIsSameRM() throws Exception
{
QpidResourceAdapter ra = new QpidResourceAdapter();
QpidRAManagedConnectionFactory mcf = new QpidRAManagedConnectionFactory();
- mcf.setConnectionURL(URL);
+ mcf.setConnectionURL(getBrokerUrl());
mcf.setResourceAdapter(ra);
QpidRAManagedConnection mc = (QpidRAManagedConnection)mcf.createManagedConnection(null, null);
AMQXAResource xa1 = (AMQXAResource)mc.getXAResource();
@@ -52,4 +51,8 @@ public class QpidRAXAResourceTest extend
}
+ private String getBrokerUrl()
+ {
+ return String.format(URL_TEMPLATE, getDefaultBroker().getAmqpPort());
+ }
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java Thu Dec 17 12:59:43 2015
@@ -31,9 +31,7 @@ import org.apache.qpid.test.utils.QpidBr
public class QpidConnectionFactoryProxyTest extends QpidBrokerTestCase
{
- private static final String BROKER_PORT = "15672";
-
- private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%2520CRAM-MD5''";
+ private static final String URL_TEMPLATE = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:%d?sasl_mechs='PLAIN%%2520CRAM-MD5''";
public void testQueueConnectionFactory() throws Exception
{
@@ -43,7 +41,7 @@ public class QpidConnectionFactoryProxyT
try
{
cf = new QpidConnectionFactoryProxy();
- ((QpidConnectionFactoryProxy)cf).setConnectionURL(URL);
+ ((QpidConnectionFactoryProxy)cf).setConnectionURL(getBrokerUrl());
c = cf.createQueueConnection();
assertTrue(c instanceof QueueConnection);
@@ -65,7 +63,7 @@ public class QpidConnectionFactoryProxyT
try
{
cf = new QpidConnectionFactoryProxy();
- ((QpidConnectionFactoryProxy)cf).setConnectionURL(URL);
+ ((QpidConnectionFactoryProxy)cf).setConnectionURL(getBrokerUrl());
c = cf.createTopicConnection();
assertTrue(c instanceof TopicConnection);
@@ -95,7 +93,7 @@ public class QpidConnectionFactoryProxyT
try
{
cf = new QpidConnectionFactoryProxy();
- ((QpidConnectionFactoryProxy)cf).setConnectionURL(URL);
+ ((QpidConnectionFactoryProxy)cf).setConnectionURL(getBrokerUrl());
c = cf.createConnection();
assertTrue(c instanceof Connection);
@@ -109,5 +107,10 @@ public class QpidConnectionFactoryProxyT
}
}
+
+ private String getBrokerUrl()
+ {
+ return String.format(URL_TEMPLATE, getDefaultBroker().getAmqpPort());
+ }
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java Thu Dec 17 12:59:43 2015
@@ -72,7 +72,7 @@ public class AbruptClientDisconnectTest
// create queue
consumeIgnoringLastSeenOmission(_utilityConnection, _testQueue, 1, 0, -1);
- _tcpTunneler = new TCPTunneler(getFailingPort(), "localhost", getPort(), 1);
+ _tcpTunneler = new TCPTunneler(getFailingPort(), "localhost", getDefaultAmqpPort(), 1);
_tcpTunneler.start();
}
@@ -210,7 +210,7 @@ public class AbruptClientDisconnectTest
private Connection createTunneledConnection(final ClientMonitor clientMonitor)
throws URLSyntaxException, JMSException
{
- final ConnectionURL url = new AMQConnectionURL(String.format(CONNECTION_URL_TEMPLATE, getFailingPort()));
+ final ConnectionURL url = new AMQConnectionURL(String.format(CONNECTION_URL_TEMPLATE, _tcpTunneler.getLocalPort()));
Connection tunneledConnection = getConnection(url);
_tcpTunneler.addClientListener(clientMonitor);
final AtomicReference _exception = new AtomicReference();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java Thu Dec 17 12:59:43 2015
@@ -20,14 +20,13 @@
*/
package org.apache.qpid.server;
-import java.io.File;
-
import javax.jms.Connection;
import javax.jms.JMSException;
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.server.logging.AbstractTestLogging;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
/**
* Series of tests to validate the external Java broker starts up as expected.
@@ -35,34 +34,24 @@ import org.apache.qpid.util.FileUtils;
public class BrokerStartupTest extends AbstractTestLogging
{
@Override
- public void startBroker()
+ public void startDefaultBroker()
{
- // Each test starts its own broker so no-op here because it is called from super.setup()
+ // noop; we do not want to start broker
}
/**
* This test simply tests that the broker will startup even if there is no config file (i.e. that it can use the
* currently packaged initial config file (all system tests by default generate their own config file).
*
- *
* @throws Exception
*/
public void testStartupWithNoConfig() throws Exception
{
if (isJavaBroker())
{
- int port = getPort(0);
-
- setTestSystemProperty("qpid.amqp_port",String.valueOf(port));
- setTestSystemProperty("qpid.http_port",String.valueOf(DEFAULT_HTTP_MANAGEMENT_PORT));
-
- File brokerConfigFile = new File(getTestConfigFile(port));
- if (brokerConfigFile.exists())
- {
- FileUtils.delete(brokerConfigFile, true);
- }
-
- startBroker(port, null);
+ super.startDefaultBroker();
+ int port = getDefaultBroker().getAmqpPort();
+ assert (port > 0) : "port should be >0";
AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"
+ GUEST_USERNAME
@@ -79,24 +68,18 @@ public class BrokerStartupTest extends A
{
if (isJavaBroker())
{
- int port = getPort(0);
-
- setTestSystemProperty("qpid.amqp_port",String.valueOf(port));
-
- //Purposely set the HTTP port to be the same as the AMQP port so that the port object becomes ERRORED
- setTestSystemProperty("qpid.http_port",String.valueOf(port));
+ // Purposely set the HTTP port to -1 so that the port object becomes ERRORED
+ final int invalidHttpPort = -1;
+ setTestSystemProperty("test.hport", String.valueOf(invalidHttpPort));
+ getDefaultBrokerConfiguration().addHttpManagementConfiguration();
+ getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, invalidHttpPort);
// Set broker to fail on startup if it has ERRORED children
setTestSystemProperty("broker.failStartupWithErroredChild", String.valueOf(Boolean.TRUE));
- File brokerConfigFile = new File(getTestConfigFile(port));
- if (brokerConfigFile.exists())
- {
- // Config exists from previous test run, delete it.
- FileUtils.delete(brokerConfigFile, true);
- }
-
- startBroker(port, null);
+ super.startDefaultBroker();
+ int port = getDefaultBroker().getAmqpPort();
+ assert (port > 0) : "port should be >0";
AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"
+ GUEST_USERNAME
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java Thu Dec 17 12:59:43 2015
@@ -56,17 +56,6 @@ public class ReturnUnroutableMandatoryMe
private final List<Message> _bouncedMessageList = Collections.synchronizedList(new ArrayList<Message>());
- static
- {
- String workdir = System.getProperty("QPID_WORK");
- if (workdir == null || workdir.equals(""))
- {
- String tempdir = System.getProperty("java.io.tmpdir");
- _logger.info("QPID_WORK not set using tmp directory: " + tempdir);
- System.setProperty("QPID_WORK", tempdir);
- }
- }
-
/**
* Tests that mandatory message which are not routable are returned to the producer
*
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java Thu Dec 17 12:59:43 2015
@@ -20,6 +20,12 @@
*/
package org.apache.qpid.server.failover;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,11 +37,6 @@ import org.apache.qpid.client.AMQConnect
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.util.SystemUtils;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class FailoverMethodTest extends QpidBrokerTestCase implements ExceptionListener
{
private static final Logger LOGGER = LoggerFactory.getLogger(FailoverMethodTest.class);
@@ -59,7 +60,7 @@ public class FailoverMethodTest extends
//note: The first broker has no connect delay and the default 1 retry
// while the tcp:localhost broker has 3 retries with a 2s connect delay
String connectionString = "amqp://guest:guest@/test?brokerlist=" +
- "'tcp://localhost:" + getPort() +
+ "'tcp://localhost:" + getDefaultAmqpPort() +
";tcp://localhost:" + _freePortWithNoBroker + "?connectdelay='2000',retries='3''";
AMQConnectionURL url = new AMQConnectionURL(connectionString);
@@ -72,7 +73,7 @@ public class FailoverMethodTest extends
connection.setExceptionListener(this);
LOGGER.debug("Stopping broker");
- stopBroker();
+ stopDefaultBroker();
LOGGER.debug("Stopped broker");
_failoverComplete.await(30, TimeUnit.SECONDS);
@@ -112,7 +113,7 @@ public class FailoverMethodTest extends
return;
}
- String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getPort() + "?connectdelay='2000',retries='3''";
+ String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getDefaultAmqpPort() + "?connectdelay='2000',retries='3''";
AMQConnectionURL url = new AMQConnectionURL(connectionString);
@@ -124,7 +125,7 @@ public class FailoverMethodTest extends
connection.setExceptionListener(this);
LOGGER.debug("Stopping broker");
- stopBroker();
+ stopDefaultBroker();
LOGGER.debug("Stopped broker");
_failoverComplete.await(30, TimeUnit.SECONDS);
@@ -171,7 +172,7 @@ public class FailoverMethodTest extends
}
int CONNECT_DELAY = 2000;
- String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getPort() + "?connectdelay='" + CONNECT_DELAY + "'," +
+ String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getDefaultAmqpPort() + "?connectdelay='" + CONNECT_DELAY + "'," +
"retries='3'',failover='nofailover'";
@@ -181,7 +182,7 @@ public class FailoverMethodTest extends
try
{
//Kill initial broker
- stopBroker();
+ stopDefaultBroker();
//Create a thread to start the broker asynchronously
brokerStart = new Thread(new Runnable()
@@ -193,7 +194,7 @@ public class FailoverMethodTest extends
//Wait before starting broker
// The wait should allow at least 1 retries to fail before broker is ready
Thread.sleep(750);
- startBroker();
+ startDefaultBroker();
}
catch (Exception e)
{
@@ -223,7 +224,7 @@ public class FailoverMethodTest extends
start = System.currentTimeMillis();
//Kill connection
- stopBroker();
+ stopDefaultBroker();
_failoverComplete.await(30, TimeUnit.SECONDS);
assertEquals("failoverLatch was not decremented in given timeframe", 0, _failoverComplete.getCount());
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java Thu Dec 17 12:59:43 2015
@@ -21,8 +21,6 @@
package org.apache.qpid.server.logging;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import javax.jms.Connection;
import javax.jms.Queue;
@@ -30,11 +28,6 @@ import javax.jms.Session;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import org.apache.qpid.systest.rest.RestTestHelper;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -115,9 +108,9 @@ public class AlertingTest extends Abstra
sendMessage(_session, _destination, _numMessages + 1);
_session.commit();
_connection.close();
- stopBroker();
+ stopDefaultBroker();
- startBroker();
+ startDefaultBroker();
wasAlertFired();
}
@@ -144,27 +137,13 @@ public class AlertingTest extends Abstra
// To prevent any failover/retry/connection dropped errors
_connection.close();
- stopBroker();
+ stopDefaultBroker();
-
- RestTestHelper restTestHelper = new RestTestHelper(findFreePort());
- TestBrokerConfiguration config = getBrokerConfiguration();
+ TestBrokerConfiguration config = getDefaultBrokerConfiguration();
config.addHttpManagementConfiguration();
- config.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, restTestHelper.getHttpPort());
-
- Map<String, Object> anonymousProviderAttributes = new HashMap<String, Object>();
- anonymousProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE);
- anonymousProviderAttributes.put(AuthenticationProvider.NAME, "testAnonymous");
- config.addObjectConfiguration(AuthenticationProvider.class, anonymousProviderAttributes);
-
- // set password authentication provider on http port for the tests
- config.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER,
- TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
- config.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
config.setSaved(false);
- restTestHelper.setUsernameAndPassword("webadmin", "webadmin");
- startBroker();
+ startDefaultBroker();
setupConnection();
@@ -176,11 +155,23 @@ public class AlertingTest extends Abstra
assertLoggingNotYetOccured(MESSAGE_COUNT_ALERT);
// Change max message count to 5, start broker and make sure that that's triggered at the right time
- TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+ TestBrokerConfiguration brokerConfiguration = getDefaultBrokerConfiguration();
setTestSystemProperty("queue.alertThresholdQueueDepthMessages","5");
brokerConfiguration.setSaved(false);
- restTestHelper.submitRequest("queue/test/test/" + getTestQueueName(), "PUT", Collections.<String, Object>singletonMap(org.apache.qpid.server.model.Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 5));
+ RestTestHelper restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
+ try
+ {
+ restTestHelper.submitRequest("queue/test/test/" + getTestQueueName(),
+ "PUT",
+ Collections.<String, Object>singletonMap(org.apache.qpid.server.model.Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+ 5));
+ }
+ finally
+ {
+ restTestHelper.tearDown();
+ }
+
// Trigger the new value
sendMessage(_session, _destination, 3);
_session.commit();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Thu Dec 17 12:59:43 2015
@@ -20,20 +20,24 @@
*/
package org.apache.qpid.server.logging;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import junit.framework.AssertionFailedError;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.test.utils.BrokerHolder;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.transport.ConnectionException;
import org.apache.qpid.util.LogMonitor;
-import java.io.IOException;
-import java.net.Socket;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* Broker Test Suite
*
@@ -55,16 +59,11 @@ public class BrokerLoggingTest extends A
private static final Pattern BROKER_MESSAGE_LOG_PATTERN = Pattern.compile(BROKER_MESSAGE_LOG_REG_EXP);
private static final String BRK_LOG_PREFIX = "BRK-";
+
@Override
- public void setUp() throws Exception
+ public void startDefaultBroker()
{
- setLogMessagePrefix();
-
- // We either do this here or have a null check in tearDown.
- // As when this test is run against profiles other than java it will NPE
- _monitor = new LogMonitor(getOutputFile());
- //We explicitly do not call super.setUp as starting up the broker is
- //part of the test case.
+ // noop. we do not want to start broker
}
/**
@@ -94,13 +93,13 @@ public class BrokerLoggingTest extends A
if (isJavaBroker())
{
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
- String configFilePath = getConfigPath();
+ String configFilePath = getDefaultBroker().getConfigurationPath();
// Ensure we wait for TESTID to be logged
waitAndFindMatches(TESTID);
@@ -136,11 +135,6 @@ public class BrokerLoggingTest extends A
}
}
- private String getConfigPath()
- {
- return getPathRelativeToWorkingDirectory(getTestConfigFile(DEFAULT_PORT));
- }
-
/**
* Description: On startup the broker reports the broker version number and svn build revision. This information is retrieved from the resource 'qpidversion.properties' which is located via the classloader.
@@ -164,7 +158,7 @@ public class BrokerLoggingTest extends A
{
String TESTID = "BRK-1001";
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
@@ -246,7 +240,7 @@ public class BrokerLoggingTest extends A
{
String TESTID = "BRK-1002";
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
@@ -297,7 +291,7 @@ public class BrokerLoggingTest extends A
//3
String message = getMessageString(log);
assertTrue("Expected Listen log not correct" + message,
- message.endsWith("Listening on TCP port " + getPort()));
+ message.endsWith("Listening on TCP port " + getDefaultBroker().getAmqpPort()));
validation = true;
}
@@ -358,9 +352,13 @@ public class BrokerLoggingTest extends A
sslPortAttributes.put(Port.NAME, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT);
sslPortAttributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
sslPortAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
- getBrokerConfiguration().addObjectConfiguration(Port.class, sslPortAttributes);
+ getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, sslPortAttributes);
+
+ super.startDefaultBroker();
- startBroker();
+ final BrokerHolder defaultBroker = getDefaultBroker();
+ int amqpTlsPort = defaultBroker.getAmqpTlsPort();
+ int amqpPort = defaultBroker.getAmqpPort();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
@@ -413,11 +411,11 @@ public class BrokerLoggingTest extends A
for (String message : listenMessages)
{
- if (message.endsWith("Listening on TCP port " + getPort()))
+ if (message.endsWith("Listening on TCP port " + amqpPort))
{
tcpStarted++;
}
- if (message.endsWith("Listening on SSL port " + DEFAULT_SSL_PORT))
+ if (message.endsWith("Listening on SSL port " + amqpTlsPort))
{
sslStarted++;
}
@@ -427,8 +425,8 @@ public class BrokerLoggingTest extends A
assertEquals("Unexpected number of logs 'Listening on SSL port'", 1, sslStarted);
//4 Test ports open
- testSocketOpen(getPort());
- testSocketOpen(DEFAULT_SSL_PORT);
+ testSocketOpen(amqpPort);
+ testSocketOpen(amqpTlsPort);
validation = true;
}
@@ -467,7 +465,7 @@ public class BrokerLoggingTest extends A
{
String TESTID = "BRK-1004";
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
@@ -555,15 +553,15 @@ public class BrokerLoggingTest extends A
{
String TESTID = "BRK-1003";
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
- stopBroker();
+ stopDefaultBroker();
//Give broker time to shutdown and flush log
- checkSocketClosed(getPort());
+ checkSocketClosed(getDefaultBroker().getAmqpPort());
List<String> results = waitAndFindMatches(BRK_LOG_PREFIX);
try
@@ -599,11 +597,12 @@ public class BrokerLoggingTest extends A
//3
String message = getMessageString(log);
+ final int amqpPort = getDefaultBroker().getAmqpPort();
assertTrue("Expected shutdown log not correct" + message,
- message.endsWith("TCP port " + getPort()));
+ message.endsWith("TCP port " + amqpPort));
//4
- checkSocketClosed(getPort());
+ checkSocketClosed(amqpPort);
validation = true;
}
@@ -654,9 +653,12 @@ public class BrokerLoggingTest extends A
sslPortAttributes.put(Port.NAME, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT);
sslPortAttributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
sslPortAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
- getBrokerConfiguration().addObjectConfiguration(Port.class, sslPortAttributes);
+ getDefaultBrokerConfiguration().addObjectConfiguration(Port.class, sslPortAttributes);
- startBroker();
+ super.startDefaultBroker();
+
+ final BrokerHolder defaultBroker = getDefaultBroker();
+ int amqpTlsPort = defaultBroker.getAmqpTlsPort();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
@@ -665,10 +667,11 @@ public class BrokerLoggingTest extends A
// //Clear any startup messages as we don't need them for validation
// _monitor.reset();
//Stop the broker to get the log messages for testing
- stopBroker();
+ stopDefaultBroker();
//Give broker time to shutdown and flush log
- checkSocketClosed(getPort());
+ final int amqpPort = getDefaultBroker().getAmqpPort();
+ checkSocketClosed(amqpPort);
List<String> results = waitAndFindMatches(TESTID);
try
@@ -692,11 +695,11 @@ public class BrokerLoggingTest extends A
for (String m : listenMessages)
{
- if (m.endsWith("Shutting down : TCP port " + getPort()))
+ if (m.endsWith("Shutting down : TCP port " + amqpPort))
{
tcpShuttingDown++;
}
- if (m.endsWith("Shutting down : SSL port " + DEFAULT_SSL_PORT))
+ if (m.endsWith("Shutting down : SSL port " + amqpTlsPort))
{
sslShuttingDown++;
}
@@ -707,9 +710,9 @@ public class BrokerLoggingTest extends A
//4
//Test Port closed
- checkSocketClosed(getPort());
+ checkSocketClosed(amqpPort);
//Test SSL Port closed
- checkSocketClosed(DEFAULT_SSL_PORT);
+ checkSocketClosed(amqpTlsPort);
}
catch (AssertionFailedError afe)
{
@@ -743,17 +746,19 @@ public class BrokerLoggingTest extends A
{
String TESTID = "BRK-1005";
- startBroker();
+ super.startDefaultBroker();
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(getOutputFile());
getConnection().close();
- stopBroker();
+ stopDefaultBroker();
+
+ final int amqpPort = getDefaultBroker().getAmqpPort();
// Ensure the broker has shutdown before retreving results
- checkSocketClosed(getPort());
+ checkSocketClosed(amqpPort);
waitAndFindMatches(TESTID);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java Thu Dec 17 12:59:43 2015
@@ -21,12 +21,11 @@
package org.apache.qpid.server.logging;
-import junit.framework.AssertionFailedError;
-
-
import java.util.Arrays;
import java.util.List;
+import junit.framework.AssertionFailedError;
+
/**
* Virtualhost Test Cases
* The virtualhost test suite validates that the follow log messages as specified in the Functional Specification.
@@ -107,7 +106,7 @@ public class VirtualHostLoggingTest exte
{
if (isJavaBroker() && isInternalBroker())
{
- stopBroker();
+ stopDefaultBroker();
// Wait for the correct VHT message to arrive.
waitForMessage(VHT_PREFIX + "1002");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java Thu Dec 17 12:59:43 2015
@@ -81,7 +81,7 @@ public class NoLocalAfterRecoveryTest ex
//Ensure the no-local subscribers messages were discarded by restarting the broker
//and reconnecting to the subscription to ensure they were not recovered.
- restartBroker();
+ restartDefaultBroker();
Connection connection2 = getConnection();
connection2.start();
@@ -140,7 +140,7 @@ public class NoLocalAfterRecoveryTest ex
//We didn't receive the messages on the durable queue for the no-local subscriber
//so they are still on the broker. Restart the broker, prompting their recovery.
- restartBroker();
+ restartDefaultBroker();
Connection connection2 = getConnection();
connection2.start();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java Thu Dec 17 12:59:43 2015
@@ -20,6 +20,12 @@
*/
package org.apache.qpid.server.queue;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.jms.Connection;
+import javax.jms.Session;
+
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
@@ -27,11 +33,6 @@ import org.apache.qpid.systest.rest.Rest
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import javax.jms.Connection;
-import javax.jms.Session;
-import java.io.IOException;
-import java.util.Map;
-
/**
* This Test validates the Queue Model on the broker.
* Currently it has some basic queue creation / deletion tests.
@@ -53,14 +54,14 @@ import java.util.Map;
*/
public class ModelTest extends QpidBrokerTestCase
{
- private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort());
+ private RestTestHelper _restTestHelper;
@Override
public void setUp() throws Exception
{
- _restTestHelper.enableHttpManagement(getBrokerConfiguration());
-
+ getDefaultBrokerConfiguration().addHttpManagementConfiguration();
super.setUp();
+ _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
}
@Override
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java Thu Dec 17 12:59:43 2015
@@ -60,16 +60,16 @@ public class ProducerFlowControlTest ext
private MessageProducer _producer;
private MessageConsumer _consumer;
private Queue _queue;
- private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort());
+ private RestTestHelper _restTestHelper;
private final AtomicInteger _sentMessages = new AtomicInteger(0);
public void setUp() throws Exception
{
- _restTestHelper.enableHttpManagement(getBrokerConfiguration());
-
+ getDefaultBrokerConfiguration().addHttpManagementConfiguration();
super.setUp();
+ _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
_monitor.markDiscardPoint();
_producerConnection = getConnection();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java?rev=1720539&r1=1720538&r2=1720539&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java Thu Dec 17 12:59:43 2015
@@ -111,7 +111,7 @@ public class QueueMessageDurabilityTest
assertEquals(1,amqSession.getQueueDepth((AMQDestination)session.createQueue(DURABLE_DEFAULT_PERSIST_NAME)));
assertEquals(1,amqSession.getQueueDepth((AMQDestination)session.createQueue(NONDURABLE_ALWAYS_PERSIST_NAME)));
- restartBroker();
+ restartDefaultBroker();
conn = getConnection();
session = conn.createSession(true, Session.SESSION_TRANSACTED);
@@ -141,7 +141,7 @@ public class QueueMessageDurabilityTest
assertEquals(1,amqSession.getQueueDepth((AMQDestination)session.createQueue(DURABLE_DEFAULT_PERSIST_NAME)));
assertEquals(1,amqSession.getQueueDepth((AMQDestination)session.createQueue(NONDURABLE_ALWAYS_PERSIST_NAME)));
- restartBroker();
+ restartDefaultBroker();
conn = getConnection();
session = conn.createSession(true, Session.SESSION_TRANSACTED);
@@ -170,7 +170,7 @@ public class QueueMessageDurabilityTest
assertTrue(msg instanceof TextMessage);
assertEquals("test2", ((TextMessage) msg).getText());
session.rollback();
- restartBroker();
+ restartDefaultBroker();
conn = getConnection();
conn.start();
session = conn.createSession(true, Session.SESSION_TRANSACTED);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org