Author: kwall
Date: Fri Mar 30 08:54:06 2012
New Revision: 1307316
URL: http://svn.apache.org/viewvc?rev=1307316&view=rev
Log:
NO-JIRA: QpidBrokerTestCase - minor improvements
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1307316&r1=1307315&r2=1307316&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
Fri Mar 30 08:54:06 2012
@@ -157,7 +157,7 @@ public class QpidTestCase extends TestCa
* @param fromPort the port to scan for availability
* @throws NoSuchElementException if there are no ports available
*/
- protected int getNextAvailable(int fromPort)
+ public int getNextAvailable(int fromPort)
{
if ((fromPort < MIN_PORT_NUMBER) || (fromPort > MAX_PORT_NUMBER))
{
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java?rev=1307316&r1=1307315&r2=1307316&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
Fri Mar 30 08:54:06 2012
@@ -90,15 +90,6 @@ public class XAResourceTest extends Qpid
}
@Override
- public void stopBroker(int port) throws Exception
- {
- if (isBrokerPresent(port))
- {
- super.stopBroker(port);
- }
- }
-
- @Override
public void tearDown() throws Exception
{
try
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1307316&r1=1307315&r2=1307316&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
Fri Mar 30 08:54:06 2012
@@ -86,12 +86,4 @@ public class QpidRAConnectionTest extend
c.close();
}
}
- @Override
- public void stopBroker(int port) throws Exception
- {
- if (isBrokerPresent(port))
- {
- super.stopBroker(port);
- }
- }
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1307316&r1=1307315&r2=1307316&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Fri Mar 30 08:54:06 2012
@@ -63,9 +63,12 @@ import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
@@ -195,6 +198,7 @@ public class QpidBrokerTestCase extends
return QpidBrokerTestCase._logger;
}
+ @Override
public void runBare() throws Throwable
{
String qname = getClass().getName() + "." + getName();
@@ -243,14 +247,7 @@ public class QpidBrokerTestCase extends
}
finally
{
- try
- {
- stopBroker();
- }
- catch (Exception e)
- {
- _logger.error("exception stopping broker", e);
- }
+ stopAllBrokers();
// reset properties used in the test
revertSystemProperties();
@@ -634,12 +631,21 @@ public class QpidBrokerTestCase extends
}
}
- public void stopBroker() throws Exception
+ public void stopBroker()
{
stopBroker(0);
}
- public void stopBroker(int port) throws Exception
+ public void stopAllBrokers()
+ {
+ Set<Integer> runningBrokerPorts = new
HashSet<Integer>(getBrokerPortNumbers());
+ for (int brokerPortNumber : runningBrokerPorts)
+ {
+ stopBroker(brokerPortNumber);
+ }
+ }
+
+ public void stopBroker(int port)
{
if (isBrokerPresent(port))
{
@@ -651,12 +657,12 @@ public class QpidBrokerTestCase extends
}
}
- public void killBroker() throws Exception
+ public void killBroker()
{
killBroker(0);
}
- public void killBroker(int port) throws Exception
+ public void killBroker(int port)
{
if (isBrokerPresent(port))
{
@@ -668,7 +674,7 @@ public class QpidBrokerTestCase extends
}
}
- public boolean isBrokerPresent(int port) throws Exception
+ public boolean isBrokerPresent(int port)
{
port = getPort(port);
@@ -681,6 +687,11 @@ public class QpidBrokerTestCase extends
return _brokers.get(port);
}
+ public Set<Integer> getBrokerPortNumbers()
+ {
+ return new HashSet<Integer>(_brokers.keySet());
+ }
+
/**
* Attempt to set the Java Broker to use the BDBMessageStore for
persistence
* Falling back to the DerbyMessageStore if
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1307316&r1=1307315&r2=1307316&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
Fri Mar 30 08:54:06 2012
@@ -114,7 +114,7 @@ public class SpawnedBrokerHolder impleme
}
catch (ReflectionUtilsException e)
{
- LOGGER.warn("Could not get pid for process, Broker process
shutdown will be ungraceful");
+ LOGGER.warn("Could not get pid for process, Broker process
shutdown will be graceful");
}
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
