You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/11 17:44:20 UTC

svn commit: r1684927 [2/2] - in /qpid/java/trunk: bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/ bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeley...

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java Thu Jun 11 15:44:18 2015
@@ -25,8 +25,9 @@ import java.net.InetAddress;
 import org.apache.qpid.server.security.access.firewall.FirewallRule;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ClientActionTest extends TestCase
+public class ClientActionTest extends QpidTestCase
 {
     private Action _action = mock(Action.class);
     private AclAction _ruleAction = mock(AclAction.class);

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java Thu Jun 11 15:44:18 2015
@@ -34,8 +34,9 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.access.ObjectProperties.Property;
 import org.apache.qpid.server.security.access.ObjectType;
 import org.apache.qpid.server.security.access.Operation;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class PlainConfigurationTest extends TestCase
+public class PlainConfigurationTest extends QpidTestCase
 {
     private PlainConfiguration writeACLConfig(String...aclData) throws Exception
     {

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java Thu Jun 11 15:44:18 2015
@@ -24,8 +24,9 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.access.Permission;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class RuleTest extends TestCase
+public class RuleTest extends QpidTestCase
 {
     public void testEqualsAndHashCode()
     {

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java Thu Jun 11 15:44:18 2015
@@ -26,8 +26,9 @@ import java.net.InetAddress;
 import org.apache.qpid.server.security.access.firewall.HostnameFirewallRule;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class HostnameFirewallRuleTest extends TestCase
+public class HostnameFirewallRuleTest extends QpidTestCase
 {
     private InetAddress _addressNotInRule;
 

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java Thu Jun 11 15:44:18 2015
@@ -23,8 +23,9 @@ import java.net.InetAddress;
 import org.apache.qpid.server.security.access.firewall.NetworkFirewallRule;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class NetworkFirewallRuleTest extends TestCase
+public class NetworkFirewallRuleTest extends QpidTestCase
 {
     private static final String LOCALHOST_IP = "127.0.0.1";
     private static final String OTHER_IP_1 = "192.168.23.1";

Modified: qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java Thu Jun 11 15:44:18 2015
@@ -46,13 +46,14 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.access.config.Rule;
 import org.apache.qpid.server.security.access.config.RuleSet;
 import org.apache.qpid.server.security.auth.TestPrincipalUtils;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * In these tests, the ruleset is configured programmatically rather than from an external file.
  *
  * @see RuleSetTest
  */
-public class DefaultAccessControlTest extends TestCase
+public class DefaultAccessControlTest extends QpidTestCase
 {
     private static final String ALLOWED_GROUP = "allowed_group";
     private static final String DENIED_GROUP = "denied_group";

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java Thu Jun 11 15:44:18 2015
@@ -28,6 +28,7 @@ import org.apache.qpid.server.message.Me
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -56,7 +57,7 @@ import static org.mockito.Mockito.when;
  * delivery thread will be in progress while the rollback method is called. Hopefully this will cause the
  * deliveryTag to be lost
  */
-public class ExtractResendAndRequeueTest extends TestCase
+public class ExtractResendAndRequeueTest extends QpidTestCase
 {
 
     private UnacknowledgedMessageMapImpl _unacknowledgedMessageMap;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java Thu Jun 11 15:44:18 2015
@@ -28,8 +28,9 @@ import java.util.Collection;
 import junit.framework.TestCase;
 
 import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class UnacknowledgedMessageMapTest extends TestCase
+public class UnacknowledgedMessageMapTest extends QpidTestCase
 {
     public void testDeletedMessagesCantBeAcknowledged()
     {

Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java Thu Jun 11 15:44:18 2015
@@ -24,8 +24,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class JDBCDetailsTest extends TestCase
+public class JDBCDetailsTest extends QpidTestCase
 {
     public void testDerby()
     {

Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Thu Jun 11 15:44:18 2015
@@ -42,8 +42,9 @@ import org.apache.qpid.server.model.Conf
 import org.apache.qpid.server.model.ConfiguredObjectAttribute;
 import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
 import org.apache.qpid.server.model.Model;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ConfiguredObjectToMapConverterTest extends TestCase
+public class ConfiguredObjectToMapConverterTest extends QpidTestCase
 {
     private ConfiguredObjectToMapConverter _converter = new ConfiguredObjectToMapConverter();
     private ConfiguredObject _configuredObject = mock(ConfiguredObject.class);

Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java Thu Jun 11 15:44:18 2015
@@ -33,11 +33,12 @@ import org.apache.qpid.server.logging.Ev
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.MessageLogger;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.mockito.ArgumentMatcher;
 
 import junit.framework.TestCase;
 
-public class LoginLogoutReporterTest extends TestCase
+public class LoginLogoutReporterTest extends QpidTestCase
 {
     private LoginLogoutReporter _loginLogoutReport;
     private Subject _subject = new Subject();

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java Thu Jun 11 15:44:18 2015
@@ -40,11 +40,12 @@ import org.apache.qpid.server.logging.Me
 
 import junit.framework.TestCase;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.mockito.ArgumentMatcher;
 
 import java.util.Collections;
 
-public class ManagementLogonLogoffReporterTest extends TestCase
+public class ManagementLogonLogoffReporterTest extends QpidTestCase
 {
     private static final String TEST_JMX_UNIQUE_CONNECTION_ID = "jmxconnectionid1 jmxuser,group";
     private static final Subject TEST_USER = new Subject(false, Collections.singleton(new AuthenticatedPrincipal("jmxuser")), Collections.emptySet(), Collections.emptySet());

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java Thu Jun 11 15:44:18 2015
@@ -36,8 +36,9 @@ import org.apache.qpid.server.jmx.Manage
 import org.apache.qpid.server.jmx.ManagedObjectRegistry;
 import org.apache.qpid.server.model.Connection;
 import org.apache.qpid.server.model.Session;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ConnectionMBeanTest extends TestCase
+public class ConnectionMBeanTest extends QpidTestCase
 {
     private ConnectionMBean _connectionMBean;
     private Connection _mockConnection;

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java Thu Jun 11 15:44:18 2015
@@ -42,8 +42,9 @@ import org.apache.qpid.server.model.Bind
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ExchangeMBeanTest extends TestCase
+public class ExchangeMBeanTest extends QpidTestCase
 {
     private static final String EXCHANGE_NAME = "EXCHANGE_NAME";
     private static final String EXCHANGE_TYPE = "EXCHANGE_TYPE";

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java Thu Jun 11 15:44:18 2015
@@ -27,8 +27,9 @@ import org.apache.qpid.server.jmx.Manage
 import org.apache.qpid.server.model.Broker;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ServerInformationMBeanTest extends TestCase
+public class ServerInformationMBeanTest extends QpidTestCase
 {
     private ManagedObjectRegistry _mockManagedObjectRegistry;
     private Broker _mockBroker;

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java Thu Jun 11 15:44:18 2015
@@ -39,8 +39,9 @@ import junit.framework.TestCase;
 import org.apache.qpid.management.common.mbeans.UserManagement;
 import org.apache.qpid.server.jmx.ManagedObjectRegistry;
 import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class UserManagementMBeanTest extends TestCase
+public class UserManagementMBeanTest extends QpidTestCase
 {
     private UserManagementMBean _userManagement;
     private ManagedObjectRegistry _mockRegistry;

Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java Thu Jun 11 15:44:18 2015
@@ -34,6 +34,7 @@ import java.util.Map;
 import javax.management.OperationsException;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
 
@@ -45,7 +46,7 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.virtualhost.QueueExistsException;
 
-public class VirtualHostManagerMBeanTest extends TestCase
+public class VirtualHostManagerMBeanTest extends QpidTestCase
 {
     private static final String TEST_QUEUE_NAME = "QUEUE_NAME";
     private static final String TEST_EXCHANGE_NAME = "EXCHANGE_NAME";

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java Thu Jun 11 15:44:18 2015
@@ -31,8 +31,9 @@ import javax.jms.JMSException;
 import junit.framework.TestCase;
 
 import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class AMQConnectionFactoryTest extends TestCase
+public class AMQConnectionFactoryTest extends QpidTestCase
 {
 
     //URL will be returned with the password field swapped for '********'

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java Thu Jun 11 15:44:18 2015
@@ -34,8 +34,9 @@ import javax.jms.Queue;
 import javax.jms.Topic;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class AMQDestinationTest extends TestCase
+public class AMQDestinationTest extends QpidTestCase
 {
     public void testEqualsAndHashCodeForAddressBasedDestinations() throws Exception
     {

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java Thu Jun 11 15:44:18 2015
@@ -21,8 +21,9 @@
 package org.apache.qpid.client;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class AMQQueueTest extends TestCase
+public class AMQQueueTest extends QpidTestCase
 {
 
     public void testToURLNoBindings()

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java Thu Jun 11 15:44:18 2015
@@ -23,11 +23,12 @@ package org.apache.qpid.client;
 import junit.framework.TestCase;
 
 import org.apache.qpid.test.unit.message.TestAMQSession;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.url.AMQBindingURL;
 
 import javax.jms.Session;
 
-public class BasicMessageConsumer_0_8_Test extends TestCase
+public class BasicMessageConsumer_0_8_Test extends QpidTestCase
 {
     /**
      * Test that if there is a value for Reject Behaviour specified for the Destination

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java Thu Jun 11 15:44:18 2015
@@ -22,10 +22,11 @@ package org.apache.qpid.client.message;
 
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.JMSException;
 
-public class AbstractJMSMessageTest extends TestCase
+public class AbstractJMSMessageTest extends QpidTestCase
 {
 
     public void testSetNullJMSReplyTo08() throws JMSException

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java Thu Jun 11 15:44:18 2015
@@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLat
 import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +56,7 @@ import org.apache.qpid.protocol.AMQConst
  * be no exception set to throw and so the wait will occur. That said when the session is closed the framelisteners
  * should be notified. Not sure this is tested.
  */
-public class AMQProtocolHandlerTest extends TestCase
+public class AMQProtocolHandlerTest extends QpidTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(AMQProtocolHandlerTest.class);
 

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java Thu Jun 11 15:44:18 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.client.security;
 import junit.framework.TestCase;
 
 import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
@@ -35,7 +36,7 @@ import java.util.Arrays;
  * used by the CRAM-MD5-HASHED SASL mechanism.
  *
  */
-public class UsernameHashedPasswordCallbackHandlerTest extends TestCase
+public class UsernameHashedPasswordCallbackHandlerTest extends QpidTestCase
 {
     private AMQCallbackHandler _callbackHandler = new UsernameHashedPasswordCallbackHandler(); // Class under test
     private static final String PROMPT_UNUSED = "unused";

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java Thu Jun 11 15:44:18 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.client.security;
 import junit.framework.TestCase;
 
 import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
@@ -32,7 +33,7 @@ import javax.security.auth.callback.Pass
  * Unit tests for the UsernamePasswordCallbackHandler.
  *
  */
-public class UsernamePasswordCallbackHandlerTest extends TestCase
+public class UsernamePasswordCallbackHandlerTest extends QpidTestCase
 {
     private AMQCallbackHandler _callbackHandler = new UsernamePasswordCallbackHandler(); // Class under test
     private static final String PROMPT_UNUSED = "unused";

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java Thu Jun 11 15:44:18 2015
@@ -27,8 +27,9 @@ import org.apache.qpid.client.filter.JMS
 import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class JMSSelectorFilterTest extends TestCase
+public class JMSSelectorFilterTest extends QpidTestCase
 {
 
     public void testEmptySelectorFilter() throws Exception

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java Thu Jun 11 15:44:18 2015
@@ -29,6 +29,7 @@ import org.apache.qpid.jms.failover.Fail
 import org.apache.qpid.jms.failover.FailoverRoundRobinServers;
 import org.apache.qpid.jms.failover.FailoverSingleServer;
 import org.apache.qpid.jms.failover.NoFailover;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.ConnectionConsumer;
 import javax.jms.ConnectionMetaData;
@@ -46,7 +47,7 @@ import javax.jms.Topic;
  * is no longer in use.
  *
  */
-public class FailoverPolicyTest extends TestCase
+public class FailoverPolicyTest extends QpidTestCase
 {
     private FailoverPolicy _failoverPolicy = null; // class under test
     private String _url;

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java Thu Jun 11 15:44:18 2015
@@ -26,13 +26,14 @@ import org.apache.qpid.client.message.JM
 import org.apache.qpid.client.message.TestMessageHelper;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.FieldTableFactory;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.JMSException;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public class FieldTableKeyEnumeratorTest extends TestCase
+public class FieldTableKeyEnumeratorTest extends QpidTestCase
 {
     public void testTrue()
     {

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java Thu Jun 11 15:44:18 2015
@@ -24,11 +24,12 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.JMSException;
 import java.util.Enumeration;
 
-public class FieldTablePropertyTest extends TestCase
+public class FieldTablePropertyTest extends QpidTestCase
 {
     public void testPropertyNames()
     {

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java Thu Jun 11 15:44:18 2015
@@ -31,9 +31,10 @@ import junit.framework.TestCase;
 import org.apache.qpid.client.BrokerDetails;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.url.URLSyntaxException;
 
-public class ConnectionURLTest extends TestCase
+public class ConnectionURLTest extends QpidTestCase
 {
     public void testFailoverURL() throws URLSyntaxException
     {

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.test.unit.client.destinationurl;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +34,7 @@ import org.apache.qpid.url.BindingURL;
 
 import java.net.URISyntaxException;
 
-public class DestinationURLTest extends TestCase
+public class DestinationURLTest extends QpidTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(DestinationURLTest.class);
 

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java Thu Jun 11 15:44:18 2015
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.client.message.JMSBytesMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.MessageEOFException;
 import javax.jms.MessageFormatException;
@@ -31,7 +32,7 @@ import javax.jms.MessageNotReadableExcep
 import javax.jms.MessageNotWriteableException;
 import java.util.HashMap;
 
-public class BytesMessageTest extends TestCase
+public class BytesMessageTest extends QpidTestCase
 {
     /**
      * Tests that on creation a call to getBodyLength() throws an exception

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java Thu Jun 11 15:44:18 2015
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.test.unit.client.message;
 
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.junit.Assert;
 import junit.framework.TestCase;
 
@@ -30,7 +31,7 @@ import javax.jms.JMSException;
 import javax.jms.MessageFormatException;
 
 
-public class MapMessageTest extends TestCase
+public class MapMessageTest extends QpidTestCase
 {
 
     //Test Lookups

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java Thu Jun 11 15:44:18 2015
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.client.message.JMSStreamMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.jms.JMSException;
 import javax.jms.MessageEOFException;
@@ -36,7 +37,7 @@ import java.util.HashMap;
 /**
  * @author Apache Software Foundation
  */
-public class StreamMessageTest extends TestCase
+public class StreamMessageTest extends QpidTestCase
 {
     /**
      * Tests that on creation a call to getBodyLength() throws an exception

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java Thu Jun 11 15:44:18 2015
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.test.unit.client.message;
 
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.junit.Assert;
 import junit.framework.TestCase;
 
@@ -29,7 +30,7 @@ import org.apache.qpid.client.message.Te
 
 import javax.jms.JMSException;
 
-public class TextMessageTest extends TestCase
+public class TextMessageTest extends QpidTestCase
 {
     public void testTextOnConstruction() throws Exception
     {

Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java Thu Jun 11 15:44:18 2015
@@ -27,6 +27,7 @@ import javax.jms.Message;
 import javax.jms.TextMessage;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,7 @@ import org.apache.qpid.client.message.Me
 import org.apache.qpid.exchange.ExchangeDefaults;
 
 
-public class MessageConverterTest extends TestCase
+public class MessageConverterTest extends QpidTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(MessageConverterTest.class);
     public static final String JMS_CORR_ID = "QPIDID_01";

Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java Thu Jun 11 15:44:18 2015
@@ -25,6 +25,7 @@ import javax.security.auth.Subject;
 import java.security.PrivilegedAction;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <code>ThreadFactory</code> to create threads with empty inherited  <code>java.security.AccessControlContext</code>
@@ -34,6 +35,13 @@ import java.util.concurrent.ThreadFactor
 public class SuppressingInheritedAccessControlContextThreadFactory implements ThreadFactory
 {
     private final ThreadFactory _defaultThreadFactory = Executors.defaultThreadFactory();
+    private final String _threadNamePrefix;
+    private final AtomicInteger _threadId = new AtomicInteger();
+
+    public SuppressingInheritedAccessControlContextThreadFactory(String threadNamePrefix)
+    {
+        _threadNamePrefix = threadNamePrefix;
+    }
 
     @Override
     public Thread newThread(final Runnable runnable)
@@ -43,7 +51,12 @@ public class SuppressingInheritedAccessC
                                                 @Override
                                                 public Thread run()
                                                 {
-                                                    return _defaultThreadFactory.newThread(runnable);
+                                                    Thread thread = _defaultThreadFactory.newThread(runnable);
+                                                    if (_threadNamePrefix != null)
+                                                    {
+                                                        thread.setName(_threadNamePrefix + "-" + _threadId.getAndIncrement());
+                                                    }
+                                                    return thread;
                                                 }
                                             }, null);
     }

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java Thu Jun 11 15:44:18 2015
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
 import org.apache.qpid.framing.AMQFrameDecodingException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * This test is to ensure that when an AMQException is rethrown that the specified exception is correctly wrapped up.
@@ -35,7 +36,7 @@ import org.apache.qpid.protocol.AMQConst
  * Re-throwing a Subclass of AMQException that does not have the default AMQException constructor which will force the
  * creation of an AMQException.
  */
-public class AMQExceptionTest extends TestCase
+public class AMQExceptionTest extends QpidTestCase
 {
     /**
      * Test that an AMQException will be correctly created and rethrown.

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java Thu Jun 11 15:44:18 2015
@@ -40,9 +40,10 @@ import org.apache.qpid.framing.ContentBo
 import org.apache.qpid.framing.FrameCreatingMethodProcessor;
 import org.apache.qpid.framing.HeartbeatBody;
 import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.BytesDataOutput;
 
-public class AMQDecoderTest extends TestCase
+public class AMQDecoderTest extends QpidTestCase
 {
 
     private AMQDecoder _decoder;

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java Thu Jun 11 15:44:18 2015
@@ -21,11 +21,12 @@
 package org.apache.qpid.framing;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
-public class AMQShortStringTest extends TestCase
+public class AMQShortStringTest extends QpidTestCase
 {
 
     public static final AMQShortString HELLO = new AMQShortString("Hello");

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.framing;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,7 +30,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 
-public class BasicContentHeaderPropertiesTest extends TestCase
+public class BasicContentHeaderPropertiesTest extends QpidTestCase
 {
 
     private BasicContentHeaderProperties _testProperties;

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java Thu Jun 11 15:44:18 2015
@@ -31,11 +31,12 @@ import java.util.Collections;
 import java.util.Iterator;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.junit.Assert;
 
 import org.apache.qpid.AMQPInvalidClassException;
 
-public class FieldTableTest extends TestCase
+public class FieldTableTest extends QpidTestCase
 {
     /**
      * Test that setting a similar named value replaces any previous value set on that name

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java Thu Jun 11 15:44:18 2015
@@ -24,8 +24,9 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class MessagePublishInfoImplTest extends TestCase
+public class MessagePublishInfoImplTest extends QpidTestCase
 {
     private MessagePublishInfo _mpi;
     private final AMQShortString _exchange = new AMQShortString("exchange");

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java Thu Jun 11 15:44:18 2015
@@ -67,7 +67,7 @@ public class SuppressingInheritedAccessC
             public Void run()
             {
                 callerAccessControlContextCapturer.set(AccessController.getContext());
-                SuppressingInheritedAccessControlContextThreadFactory factory = new SuppressingInheritedAccessControlContextThreadFactory();
+                SuppressingInheritedAccessControlContextThreadFactory factory = new SuppressingInheritedAccessControlContextThreadFactory(null);
                 factory.newThread(new Runnable()
                 {
 

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java Thu Jun 11 15:44:18 2015
@@ -22,11 +22,12 @@
 package org.apache.qpid.thread;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * Tests the ThreadFactory.
  */
-public class ThreadFactoryTest extends TestCase
+public class ThreadFactoryTest extends QpidTestCase
 {
     public void testThreadFactory()
     {

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java Thu Jun 11 15:44:18 2015
@@ -21,13 +21,14 @@
 package org.apache.qpid.transport;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * GenTest
  *
  */
 
-public class GenTest extends TestCase
+public class GenTest extends QpidTestCase
 {
 
     public void testBooleans()

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.transport;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import static org.apache.qpid.util.Serial.COMPARATOR;
 import static org.apache.qpid.util.Serial.eq;
@@ -35,7 +36,7 @@ import java.util.List;
  *
  */
 
-public class RangeSetTest extends TestCase
+public class RangeSetTest extends QpidTestCase
 {
 
     private void check(RangeSet ranges)

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.transport.codec;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.nio.ByteBuffer;
 
@@ -29,7 +30,7 @@ import java.nio.ByteBuffer;
  *
  */
 
-public class BBEncoderTest extends TestCase
+public class BBEncoderTest extends QpidTestCase
 {
 
     public void testGrow()

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java Thu Jun 11 15:44:18 2015
@@ -27,11 +27,12 @@ import java.security.cert.Certificate;
 
 import junit.framework.TestCase;
 
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.ByteBufferSender;
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.transport.network.TransportActivity;
 
-public class IdleTimeoutTickerTest extends TestCase implements TransportActivity, NetworkConnection
+public class IdleTimeoutTickerTest extends QpidTestCase implements TransportActivity, NetworkConnection
 {
     private IdleTimeoutTicker _ticker;
     private static final int DEFAULT_TIMEOUT = 567890;

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java Thu Jun 11 15:44:18 2015
@@ -21,12 +21,13 @@
 package org.apache.qpid.util;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-public class ByteBufferInputStreamTest extends TestCase
+public class ByteBufferInputStreamTest extends QpidTestCase
 {
     private byte[] _data = {2, 1, 5, 3, 4};
     private ByteBufferInputStream _inputStream;

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java Thu Jun 11 15:44:18 2015
@@ -24,6 +24,7 @@ package org.apache.qpid.util;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,15 +59,10 @@ import java.util.Properties;
  * <tr><td> Check that get options in force return a non-empty string after parsing.
  * </table>
  */
-public class CommandLineParserTest extends TestCase
+public class CommandLineParserTest extends QpidTestCase
 {
     private static final Logger log = LoggerFactory.getLogger(CommandLineParserTest.class);
 
-    public CommandLineParserTest(String name)
-    {
-        super(name);
-    }
-
     /**
      * Compile all the tests for the default test implementation of a traversable state into a test suite.
      */

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.util;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -31,7 +32,7 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Properties;
 
-public class FileUtilsTest extends TestCase
+public class FileUtilsTest extends QpidTestCase
 {
     private static final String COPY = "-Copy";
     private static final String SUB = "-Sub";

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java Thu Jun 11 15:44:18 2015
@@ -27,8 +27,9 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class GZIPUtilsTest extends TestCase
+public class GZIPUtilsTest extends QpidTestCase
 {
     public void testCompressUncompress() throws Exception
     {

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java Thu Jun 11 15:44:18 2015
@@ -21,8 +21,6 @@
 package org.apache.qpid.util;
 
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**

Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java (original)
+++ qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java Thu Jun 11 15:44:18 2015
@@ -24,8 +24,9 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class StringsTest extends TestCase
+public class StringsTest extends QpidTestCase
 {
     public void testSubstitutionResolver()
     {

Modified: qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java (original)
+++ qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java Thu Jun 11 15:44:18 2015
@@ -28,8 +28,9 @@ import javax.resource.spi.ResourceAdapte
 import org.apache.qpid.ra.inflow.QpidActivationSpec;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class QpidActivationSpecTest extends TestCase
+public class QpidActivationSpecTest extends QpidTestCase
 {
 
     public void testActivationSpecBasicSerialization() throws Exception

Modified: qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java (original)
+++ qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java Thu Jun 11 15:44:18 2015
@@ -26,9 +26,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 
-public class QpidResourceAdapterTest extends TestCase
+public class QpidResourceAdapterTest extends QpidTestCase
 {
     public void testGetXAResources() throws Exception
     {

Modified: qpid/java/trunk/management/common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/management/common/pom.xml?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/management/common/pom.xml (original)
+++ qpid/java/trunk/management/common/pom.xml Thu Jun 11 15:44:18 2015
@@ -30,6 +30,13 @@
   <description>Common management code</description>
 
   <dependencies>
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-test-utils</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
    
   <build>

Modified: qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java (original)
+++ qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
 package org.apache.qpid.management.common.mbeans;
 
 import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.management.MBeanAttributeInfo;
 import javax.management.NotCompliantMBeanException;
@@ -30,7 +31,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-public class ManagedQueueTest extends TestCase
+public class ManagedQueueTest extends QpidTestCase
 {
     public void testAttributesContants()
     {

Modified: qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Thu Jun 11 15:44:18 2015
@@ -24,11 +24,7 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.*;
 
 import junit.framework.TestCase;
 import junit.framework.TestResult;
@@ -48,11 +44,14 @@ public class QpidTestCase extends TestCa
     public static final String TMP_FOLDER = System.getProperty("java.io.tmpdir");
 
     private static final Logger _logger = LoggerFactory.getLogger(QpidTestCase.class);
+    private static QpidTestCase _currentInstance;
 
     private final Map<String, String> _propertiesSetForTest = new HashMap<String, String>();
 
     private String _testName;
 
+    private Set<Runnable> _tearDownRegistry = new HashSet<>();
+
     /**
      * Some tests are excluded when the property test.excludes is set to true.
      * An exclusion list is either a file (prop test.excludesfile) which contains one test name
@@ -134,6 +133,7 @@ public class QpidTestCase extends TestCa
 
     public void run(TestResult testResult)
     {
+        _currentInstance = this;
         if (_exclusionList != null && (_exclusionList.contains(getClass().getPackage().getName() + ".*") ||
                                        _exclusionList.contains(getClass().getName() + "#*") ||
                                        _exclusionList.contains(getClass().getName() + "#" + getName())))
@@ -164,6 +164,15 @@ public class QpidTestCase extends TestCa
         return System.getProperty(VIRTUAL_HOST_NODE_CONTEXT_BLUEPRINT);
     }
 
+    public void registerTearDown(Runnable runnable)
+    {
+        _tearDownRegistry.add(runnable);
+    }
+
+    public static QpidTestCase getCurrentInstance()
+    {
+        return _currentInstance;
+    }
 
     /**
      * Gets the next available port starting at a port.
@@ -238,10 +247,17 @@ public class QpidTestCase extends TestCa
     {
         _logger.info("========== tearDown " + _testName + " ==========");
         revertTestSystemProperties();
+        for (Runnable runnable : _tearDownRegistry)
+        {
+            runnable.run();
+        }
+        _tearDownRegistry.clear();
+        _currentInstance = null;
     }
 
     protected void setUp() throws Exception
     {
+        _currentInstance = this;
         _testName = getClass().getSimpleName() + "." + getName();
         _logger.info("========== start " + _testName + " ==========");
     }



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