Author: rgodfrey
Date: Thu Jun 11 15:44:18 2015
New Revision: 1684927
URL: http://svn.apache.org/r1684927
Log:
QPID-6584 : [Java Test] ensure tests clean up thread pools created by vhosts on
closing (work by Lorenz Quack and Rob Godfrey)
Removed:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueThreadPoolTest.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
Modified:
qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
qpid/java/trunk/broker-core/src/main/resources/initial-config.json
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/NetworkConnectionSchedulerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRuleTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapTest.java
qpid/java/trunk/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java
qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
qpid/java/trunk/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
qpid/java/trunk/management/common/pom.xml
qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
(original)
+++
qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
Thu Jun 11 15:44:18 2015
@@ -45,8 +45,9 @@ import org.apache.qpid.server.virtualhos
import
org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHARemoteReplicationNode;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode;
import org.apache.qpid.server.virtualhostnode.berkeleydb.NodeRole;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class BDBHAMessageStoreManagerMBeanTest extends TestCase
+public class BDBHAMessageStoreManagerMBeanTest extends QpidTestCase
{
private static final String TEST_VHOST_NAME = "test";
private static final String TEST_GROUP_NAME = TEST_VHOST_NAME;
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
Thu Jun 11 15:44:18 2015
@@ -126,6 +126,12 @@ public class BDBHAReplicaVirtualHostImpl
}
@Override
+ public void executeTask(Runnable task)
+ {
+ throwUnsupportedForReplica();
+ }
+
+ @Override
public Broker<?> getBroker()
{
return _broker;
Modified:
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
(original)
+++
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
Thu Jun 11 15:44:18 2015
@@ -23,12 +23,13 @@ import com.sleepycat.bind.tuple.TupleOut
import junit.framework.TestCase;
import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Tests for {@code AMQShortStringEncoding} including corner cases when string
* is null or over 127 characters in length
*/
-public class AMQShortStringEncodingTest extends TestCase
+public class AMQShortStringEncodingTest extends QpidTestCase
{
public void testWriteReadNullValues()
Modified:
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
(original)
+++
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
Thu Jun 11 15:44:18 2015
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
import org.apache.qpid.test.utils.QpidTestCase;
-public class EnvHomeRegistryTest extends TestCase
+public class EnvHomeRegistryTest extends QpidTestCase
{
private final EnvHomeRegistry _ehr = new EnvHomeRegistry();
Modified:
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
(original)
+++
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
Thu Jun 11 15:44:18 2015
@@ -30,8 +30,9 @@ import org.apache.qpid.server.store.Conf
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class ConfiguredObjectBindingTest extends TestCase
+public class ConfiguredObjectBindingTest extends QpidTestCase
{
private ConfiguredObjectRecord _object;
Modified:
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
(original)
+++
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
Thu Jun 11 15:44:18 2015
@@ -32,8 +32,9 @@ import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseConfig;
import com.sleepycat.je.Environment;
import com.sleepycat.je.Transaction;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class DatabaseTemplateTest extends TestCase
+public class DatabaseTemplateTest extends QpidTestCase
{
private static final String SOURCE_DATABASE = "sourceDatabase";
private Environment _environment;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Thu Jun 11 15:44:18 2015
@@ -91,7 +91,7 @@ public interface VirtualHost<X extends V
long getStoreTransactionOpenTimeoutWarn();
@ManagedContextDefault( name = "virtualhost.housekeepingThreadCount")
- public static final int DEFAULT_HOUSEKEEPING_THREAD_COUNT = 1;
+ public static final int DEFAULT_HOUSEKEEPING_THREAD_COUNT = 4;
@ManagedAttribute( defaultValue = "${virtualhost.housekeepingThreadCount}")
int getHousekeepingThreadCount();
@@ -102,6 +102,8 @@ public interface VirtualHost<X extends V
@ManagedContextDefault( name = "virtualhost.enabledConnectionValidators")
String DEFAULT_ENABLED_VALIDATORS = "[]";
+ void executeTask(Runnable task);
+
@ManagedAttribute( defaultValue =
"${virtualhost.enabledConnectionValidators}")
List<String> getEnabledConnectionValidators();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu Jun 11 15:44:18 2015
@@ -48,7 +48,6 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.pool.ReferenceCountingExecutorService;
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.Task;
@@ -208,10 +207,8 @@ public abstract class AbstractQueue<X ex
private int _maxAsyncDeliveries;
-
private final AtomicLong _stateChangeCount = new
AtomicLong(Long.MIN_VALUE);
- private final Executor _asyncDelivery;
private AtomicInteger _deliveredMessages = new AtomicInteger();
private AtomicBoolean _stopped = new AtomicBoolean(false);
@@ -276,8 +273,6 @@ public abstract class AbstractQueue<X ex
super(parentsMap(virtualHost), attributes);
_virtualHost = virtualHost;
- _asyncDelivery =
ReferenceCountingExecutorService.getInstance().acquireExecutorService();
-
}
@Override
@@ -555,7 +550,7 @@ public abstract class AbstractQueue<X ex
if (_virtualHost.getState() != State.UNAVAILABLE)
{
- _asyncDelivery.execute(runnable);
+ _virtualHost.executeTask(runnable);
}
}
catch (RejectedExecutionException ree)
@@ -1953,10 +1948,7 @@ public abstract class AbstractQueue<X ex
protected void onClose()
{
super.onClose();
- if (!_stopped.getAndSet(true))
- {
-
ReferenceCountingExecutorService.getInstance().releaseExecutorService();
- }
+ _stopped.set(true);
_closing = false;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
Thu Jun 11 15:44:18 2015
@@ -34,6 +34,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.qpid.server.model.SystemConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Thu Jun 11 15:44:18 2015
@@ -405,7 +405,7 @@ public abstract class AbstractVirtualHos
private void standardExchangeCreated()
{
- if(_createdExchangeCount.incrementAndGet() ==
TOTAL_STANDARD_EXCHANGES)
+ if (_createdExchangeCount.incrementAndGet() ==
TOTAL_STANDARD_EXCHANGES)
{
_future.set(null);
}
@@ -588,6 +588,12 @@ public abstract class AbstractVirtualHos
return _houseKeepingTasks.schedule(task, delay, TimeUnit.MILLISECONDS);
}
+ @Override
+ public void executeTask(Runnable task)
+ {
+ _houseKeepingTasks.execute(task);
+ }
+
public long getHouseKeepingTaskCount()
{
return _houseKeepingTasks.getTaskCount();
@@ -1622,7 +1628,7 @@ public abstract class AbstractVirtualHos
@StateTransition( currentState = { State.UNINITIALIZED,State.ERRORED },
desiredState = State.ACTIVE )
private ListenableFuture<Void> onActivate()
{
- _houseKeepingTasks = new
ScheduledThreadPoolExecutor(getHousekeepingThreadCount(), new
SuppressingInheritedAccessControlContextThreadFactory());
+ _houseKeepingTasks = new
ScheduledThreadPoolExecutor(getHousekeepingThreadCount(), new
SuppressingInheritedAccessControlContextThreadFactory("virtualhost-" +
getName() + "-pool"));
MessageStore messageStore = getMessageStore();
messageStore.openMessageStore(this);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
Thu Jun 11 15:44:18 2015
@@ -126,6 +126,12 @@ class RedirectingVirtualHostImpl
}
@Override
+ public void executeTask(Runnable task)
+ {
+ throwUnsupportedForRedirector();
+ }
+
+ @Override
protected <C extends ConfiguredObject> ListenableFuture<C>
addChildAsync(final Class<C> childClass,
final Map<String, Object> attributes,
final ConfiguredObject... otherParents)
Modified: qpid/java/trunk/broker-core/src/main/resources/initial-config.json
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/resources/initial-config.json?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/resources/initial-config.json
(original)
+++ qpid/java/trunk/broker-core/src/main/resources/initial-config.json Thu Jun
11 15:44:18 2015
@@ -61,7 +61,6 @@
"name" : "AMQP",
"port" : "${qpid.amqp_port}",
"authenticationProvider" : "passwordFile",
- "secureOnlyMechanisms" : [ ],
"virtualhostaliases" : [ {
"name" : "nameAlias",
"type" : "nameAlias"
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
Thu Jun 11 15:44:18 2015
@@ -26,8 +26,9 @@ import junit.framework.TestCase;
import org.apache.qpid.filter.SelectorParsingException;
import org.apache.qpid.filter.selector.ParseException;
import org.apache.qpid.server.filter.JMSSelectorFilter;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class SelectorParserTest extends TestCase
+public class SelectorParserTest extends QpidTestCase
{
public void testSelectorWithHyphen()
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
Thu Jun 11 15:44:18 2015
@@ -45,8 +45,9 @@ import org.apache.qpid.server.model.Virt
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class VirtualHostCreationTest extends TestCase
+public class VirtualHostCreationTest extends QpidTestCase
{
private VirtualHostNode _virtualHostNode;
@@ -97,6 +98,7 @@ public class VirtualHostCreationTest ext
assertNotNull("Null is returned", host);
assertEquals("Unexpected name", getName(), host.getName());
+ host.close();
}
public void testCreateWithoutMandatoryAttributesResultsInException()
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
Thu Jun 11 15:44:18 2015
@@ -36,8 +36,9 @@ import javax.security.auth.Subject;
import junit.framework.TestCase;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class TaskExecutorTest extends TestCase
+public class TaskExecutorTest extends QpidTestCase
{
private TaskExecutorImpl _executor;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
Thu Jun 11 15:44:18 2015
@@ -35,6 +35,7 @@ import junit.framework.TestCase;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -53,7 +54,7 @@ import org.apache.qpid.server.queue.Base
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-public class FanoutExchangeTest extends TestCase
+public class FanoutExchangeTest extends QpidTestCase
{
private FanoutExchange _exchange;
private VirtualHostImpl _virtualHost;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
Thu Jun 11 15:44:18 2015
@@ -41,10 +41,11 @@ import org.apache.qpid.server.model.Bind
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
*/
-public class HeadersBindingTest extends TestCase
+public class HeadersBindingTest extends QpidTestCase
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Thu Jun 11 15:44:18 2015
@@ -38,6 +38,7 @@ import junit.framework.TestCase;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -58,7 +59,7 @@ import org.apache.qpid.server.queue.Base
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-public class HeadersExchangeTest extends TestCase
+public class HeadersExchangeTest extends QpidTestCase
{
private HeadersExchange _exchange;
private VirtualHostImpl _virtualHost;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
Thu Jun 11 15:44:18 2015
@@ -19,8 +19,9 @@
package org.apache.qpid.server.filter;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class JMSSelectorFilterTest extends TestCase
+public class JMSSelectorFilterTest extends QpidTestCase
{
public void testEqualsAndHashCodeUsingSelectorString() throws Exception
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
Thu Jun 11 15:44:18 2015
@@ -21,6 +21,7 @@
package org.apache.qpid.server.logging;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
import java.util.List;
@@ -33,7 +34,7 @@ import java.util.List;
* retrieved and cleared.
*
*/
-public class UnitTestMessageLoggerTest extends TestCase
+public class UnitTestMessageLoggerTest extends QpidTestCase
{
private static final String TEST_MESSAGE = "Test";
private static final String TEST_THROWABLE = "Test Throwable";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
Thu Jun 11 15:44:18 2015
@@ -39,8 +39,9 @@ import junit.framework.TestCase;
import org.apache.qpid.server.model.testmodels.hierarchy.TestModel;
import org.apache.qpid.server.model.testmodels.hierarchy.TestCar;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class AttributeValueConverterTest extends TestCase
+public class AttributeValueConverterTest extends QpidTestCase
{
private final ConfiguredObjectFactory _objectFactory =
TestModel.getInstance().getObjectFactory();
private final Map<String, Object> _attributes = new HashMap<>();
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
Thu Jun 11 15:44:18 2015
@@ -32,8 +32,9 @@ import junit.framework.TestCase;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
import org.apache.qpid.server.model.ManagedInterface;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class ConfiguredObjectTypeRegistryTest extends TestCase
+public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
{
private ConfiguredObjectTypeRegistry _typeRegistry =
TestModel.getInstance().getTypeRegistry();
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
Thu Jun 11 15:44:18 2015
@@ -42,8 +42,9 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class LastValueQueueListTest extends TestCase
+public class LastValueQueueListTest extends QpidTestCase
{
private static final String CONFLATION_KEY = "CONFLATION_KEY";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
Thu Jun 11 15:44:18 2015
@@ -37,8 +37,9 @@ import junit.framework.TestCase;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.QueueNotificationListener;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class NotificationCheckTest extends TestCase
+public class NotificationCheckTest extends QpidTestCase
{
private ServerMessage<?> _message = mock(ServerMessage.class);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
Thu Jun 11 15:44:18 2015
@@ -42,11 +42,12 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Tests for {@link QueueEntryImpl}
*/
-public abstract class QueueEntryImplTestBase extends TestCase
+public abstract class QueueEntryImplTestBase extends QpidTestCase
{
// tested entry
protected QueueEntryImpl _queueEntry;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
Thu Jun 11 15:44:18 2015
@@ -29,11 +29,12 @@ import org.apache.qpid.server.message.AM
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Abstract test class for QueueEntryList implementations.
*/
-public abstract class QueueEntryListTestBase extends TestCase
+public abstract class QueueEntryListTestBase extends QpidTestCase
{
public abstract QueueEntryList getTestList();
public abstract QueueEntryList getTestList(boolean newList);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
Thu Jun 11 15:44:18 2015
@@ -38,8 +38,9 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.AuthenticationResult;
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class SubjectCreatorTest extends TestCase
+public class SubjectCreatorTest extends QpidTestCase
{
private static final String USERNAME = "username";
private static final String PASSWORD = "password";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
Thu Jun 11 15:44:18 2015
@@ -25,8 +25,9 @@ import javax.security.auth.Subject;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class AuthenticatedPrincipalTest extends TestCase
+public class AuthenticatedPrincipalTest extends QpidTestCase
{
private AuthenticatedPrincipal _authenticatedPrincipal = new
AuthenticatedPrincipal(new UsernamePrincipal("name"));
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
Thu Jun 11 15:44:18 2015
@@ -29,8 +29,9 @@ import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class AuthenticationResultTest extends TestCase
+public class AuthenticationResultTest extends QpidTestCase
{
public void testConstructWithAuthenticationStatusContinue()
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
Thu Jun 11 15:44:18 2015
@@ -21,12 +21,13 @@
package org.apache.qpid.server.security.auth;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Tests the UsernamePrincipal.
*
*/
-public class UsernamePrincipalTest extends TestCase
+public class UsernamePrincipalTest extends QpidTestCase
{
public void testEqualitySameObject()
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
Thu Jun 11 15:44:18 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.server.security.
import junit.framework.TestCase;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.test.utils.QpidTestCase;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
@@ -42,7 +43,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
-public class Base64MD5PasswordFilePrincipalDatabaseTest extends TestCase
+public class Base64MD5PasswordFilePrincipalDatabaseTest extends QpidTestCase
{
private static final String TEST_COMMENT = "# Test Comment";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
Thu Jun 11 15:44:18 2015
@@ -21,13 +21,14 @@
package org.apache.qpid.server.security.auth.database;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
import java.io.UnsupportedEncodingException;
/*
Note User is mainly tested by Base64MD5PFPDTest this is just to catch the
extra methods
*/
-public class HashedUserTest extends TestCase
+public class HashedUserTest extends QpidTestCase
{
private String USERNAME = "username";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
Thu Jun 11 15:44:18 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.server.security.
import junit.framework.TestCase;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.test.utils.QpidTestCase;
import javax.security.auth.login.AccountNotFoundException;
import java.io.BufferedReader;
@@ -37,7 +38,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
-public class PlainPasswordFilePrincipalDatabaseTest extends TestCase
+public class PlainPasswordFilePrincipalDatabaseTest extends QpidTestCase
{
private static final String TEST_COMMENT = "# Test Comment";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
Thu Jun 11 15:44:18 2015
@@ -21,11 +21,12 @@
package org.apache.qpid.server.security.auth.database;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
/*
Note PlainUser is mainly tested by PlainPFPDTest, this is just to catch
the extra methods
*/
-public class PlainUserTest extends TestCase
+public class PlainUserTest extends QpidTestCase
{
private String USERNAME = "username";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
Thu Jun 11 15:44:18 2015
@@ -37,12 +37,13 @@ import org.apache.qpid.server.security.a
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Tests the JMXPasswordAuthenticator and its collaboration with the
AuthenticationManager.
*
*/
-public class JMXPasswordAuthenticatorTest extends TestCase
+public class JMXPasswordAuthenticatorTest extends QpidTestCase
{
static final String USER_NOT_AUTHORISED_FOR_MANAGEMENT = "User not
authorised for management";
private static final String USERNAME = "guest";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
Thu Jun 11 15:44:18 2015
@@ -37,8 +37,9 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class SimpleLDAPAuthenticationManagerFactoryTest extends TestCase
+public class SimpleLDAPAuthenticationManagerFactoryTest extends QpidTestCase
{
private ConfiguredObjectFactory _factory =
BrokerModel.getInstance().getObjectFactory();
private Map<String, Object> _configuration = new HashMap<String, Object>();
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
Thu Jun 11 15:44:18 2015
@@ -28,8 +28,9 @@ import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class LDAPSSLSocketFactoryGeneratorTest extends TestCase
+public class LDAPSSLSocketFactoryGeneratorTest extends QpidTestCase
{
private SSLSocketFactory _sslSocketFactory = mock(SSLSocketFactory.class);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
Thu Jun 11 15:44:18 2015
@@ -35,12 +35,13 @@ import junit.framework.TestCase;
import
org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexInitialiser;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
/**
* These tests ensure that the Hex wrapping that the initialiser performs does
actually operate when the handle method is called.
*/
-public class CRAMMD5HexInitialiserTest extends TestCase
+public class CRAMMD5HexInitialiserTest extends QpidTestCase
{
private static final String TEST_PASSWORD = "testPassword";
private static final String TEST_USER = "testUser";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
Thu Jun 11 15:44:18 2015
@@ -27,6 +27,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexInitialiser;
import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexSaslServer;
import
org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexServerFactory;
+import org.apache.qpid.test.utils.QpidTestCase;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
@@ -46,7 +47,7 @@ import java.security.Principal;
* This test case focuses on testing {@link CRAMMD5HexSaslServer} but also
exercises
* collaborators {@link CRAMMD5HexInitialiser} and {@link
Base64MD5PasswordFilePrincipalDatabase}
*/
-public class CRAMMD5HexServerTest extends TestCase
+public class CRAMMD5HexServerTest extends QpidTestCase
{
private SaslServer _saslServer; // Class under test
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
Thu Jun 11 15:44:18 2015
@@ -24,11 +24,12 @@ package org.apache.qpid.server.security.
import junit.framework.TestCase;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
+import org.apache.qpid.test.utils.QpidTestCase;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-public abstract class SaslServerTestCase extends TestCase
+public abstract class SaslServerTestCase extends QpidTestCase
{
protected SaslServer server;
protected String username = "u";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
Thu Jun 11 15:44:18 2015
@@ -29,8 +29,9 @@ import java.util.Set;
import org.apache.qpid.server.security.group.FileGroupDatabase;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class FileGroupDatabaseTest extends TestCase
+public class FileGroupDatabaseTest extends QpidTestCase
{
private static final String USER1 = "user1";
private static final String USER2 = "user2";
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
Thu Jun 11 15:44:18 2015
@@ -23,8 +23,9 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class GroupPrincipalTest extends TestCase
+public class GroupPrincipalTest extends QpidTestCase
{
public void testGetName()
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
Thu Jun 11 15:44:18 2015
@@ -20,12 +20,12 @@
*/
package org.apache.qpid.server.stats;
-import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* Unit tests for the {@link StatisticsCounter} class.
*/
-public class StatisticsCounterTest extends TestCase
+public class StatisticsCounterTest extends QpidTestCase
{
/**
* Check that statistics counters are created correctly.
@@ -125,7 +125,7 @@ public class StatisticsCounterTest exten
assertEquals(4000.0, counter.getPeak());
assertEquals(6000, counter.getTotal());
}
-
+
/**
* Test the current rate is generated correctly.
*/
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
Thu Jun 11 15:44:18 2015
@@ -44,8 +44,9 @@ import org.apache.qpid.server.model.Json
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class BrokerRecovererTest extends TestCase
+public class BrokerRecovererTest extends QpidTestCase
{
private ConfiguredObjectRecord _brokerEntry =
mock(ConfiguredObjectRecord.class);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
Thu Jun 11 15:44:18 2015
@@ -25,8 +25,9 @@ import static org.mockito.Mockito.verify
import static
org.apache.qpid.server.store.Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL;
import static
org.apache.qpid.server.store.Event.PERSISTENT_MESSAGE_SIZE_OVERFULL;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class EventManagerTest extends TestCase
+public class EventManagerTest extends QpidTestCase
{
private EventManager _eventManager = new EventManager();
private EventListener _mockListener = mock(EventListener.class);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java
Thu Jun 11 15:44:18 2015
@@ -101,8 +101,9 @@ public class VirtualHostStoreUpgraderAnd
@Override
public void tearDown()throws Exception
{
- super.tearDown();
_taskExecutor.stopImmediately();
+ _virtualHostNode.close();
+ super.tearDown();
}
public void testRecoverQueueWithDLQEnabled() throws Exception
@@ -142,6 +143,7 @@ public class VirtualHostStoreUpgraderAnd
assertNotNull("DLE exchange is not recovered", recoveredDLE);
assertEquals("Unexpected alternative exchange", recoveredDLE,
recoveredQueue.getAlternateExchange());
+ host.close();
}
public void
testRecordUpdatedInOneUpgraderAndRemovedInAnotherUpgraderIsNotRecovered()
@@ -185,6 +187,7 @@ public class VirtualHostStoreUpgraderAnd
Binding<?> recoveredBinding2 =
recoveredQueue.findConfiguredObject(Binding.class, "test-non-existing");
assertNull("Incorrect binding is recovered", recoveredBinding2);
+ host.close();
}
private ConfiguredObjectRecord mockBinding(String bindingName,
ConfiguredObjectRecord queue, ConfiguredObjectRecord exchange)
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/NetworkConnectionSchedulerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/NetworkConnectionSchedulerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/NetworkConnectionSchedulerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/NetworkConnectionSchedulerTest.java
Thu Jun 11 15:44:18 2015
@@ -163,6 +163,7 @@ public class NetworkConnectionSchedulerT
Thread.sleep(1000l);
verify(timidEngine, atLeast(6)).received(any(ByteBuffer.class));
_keepRunningThreads = false;
+ transport.close();
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
Thu Jun 11 15:44:18 2015
@@ -121,22 +121,26 @@ public class TCPandSSLTransportTest exte
Protocol.AMQP_0_9_1);
transport.start();
-
- SSLContext clientContext = SSLContext.getInstance("TLS");
- TrustManagerFactory tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(keyStore);
-
- clientContext.init(null, tmf.getTrustManagers(), null);
-
-
- SSLSocket sslSocket =
- (SSLSocket)
clientContext.getSocketFactory().createSocket(InetAddress.getLoopbackAddress(),
-
transport.getAcceptingPort());
-
- sslSocket.setEnabledProtocols(new String[] {clientProtocol});
-
- sslSocket.startHandshake();
- transport.close();
+ try
+ {
+ SSLContext clientContext = SSLContext.getInstance("TLS");
+ TrustManagerFactory tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(keyStore);
+
+ clientContext.init(null, tmf.getTrustManagers(), null);
+
+ SSLSocket sslSocket =
+ (SSLSocket)
clientContext.getSocketFactory().createSocket(InetAddress.getLoopbackAddress(),
+ transport.getAcceptingPort());
+
+ sslSocket.setEnabledProtocols(new String[]{clientProtocol});
+
+ sslSocket.startHandshake();
+ }
+ finally
+ {
+ transport.close();
+ }
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
Thu Jun 11 15:44:18 2015
@@ -25,12 +25,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import javax.security.auth.Subject;
@@ -58,11 +53,27 @@ import org.apache.qpid.server.virtualhos
import org.apache.qpid.server.virtualhost.QueueExistsException;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.test.utils.QpidTestCase;
public class BrokerTestHelper
{
+ private static List<VirtualHost> _createdVirtualHosts = new ArrayList<>();
+
private static final TaskExecutor TASK_EXECUTOR = new
CurrentThreadTaskExecutor();
+ private static Runnable _closeVirtualHosts = new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ for (VirtualHost virtualHost : _createdVirtualHosts)
+ {
+ virtualHost.close();
+ }
+ _createdVirtualHosts.clear();
+ }
+ };
+
static
{
TASK_EXECUTOR.start();
@@ -150,6 +161,9 @@ public class BrokerTestHelper
host = (AbstractVirtualHost)
objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
host.start();
when(virtualHostNode.getVirtualHost()).thenReturn(host);
+ _createdVirtualHosts.add(host);
+ QpidTestCase testCase = QpidTestCase.getCurrentInstance();
+ testCase.registerTearDown(_closeVirtualHosts);
return host;
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.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 MapJsonSerializerTest extends TestCase
+public class MapJsonSerializerTest extends QpidTestCase
{
private MapJsonSerializer _serializer;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
Thu Jun 11 15:44:18 2015
@@ -120,6 +120,10 @@ public class AbstractVirtualHostTest ext
{
assertTrue("Unexpected exception " + e.getMessage(),
e.getMessage().startsWith("Cannot open virtual host message store"));
}
+ finally
+ {
+ host.close();
+ }
}
public void testValidateOnCreateSucceeds()
@@ -138,6 +142,7 @@ public class AbstractVirtualHostTest ext
host.validateOnCreate();
verify(store).openMessageStore(host);
verify(store).closeMessageStore();
+ host.close();
}
public void testOpenFails()
@@ -155,6 +160,7 @@ public class AbstractVirtualHostTest ext
host.open();
assertEquals("Unexpected host state", State.ERRORED, host.getState());
+ host.close();
}
public void testOpenSucceeds()
@@ -178,6 +184,7 @@ public class AbstractVirtualHostTest ext
// make sure that method AbstractVirtualHost.onExceptionInOpen was not
called
verify(store, times(0)).closeMessageStore();
+ host.close();
}
public void testDeleteInErrorStateAfterOpen() throws Exception
@@ -223,6 +230,7 @@ public class AbstractVirtualHostTest ext
host.setAttributes(Collections.<String,
Object>singletonMap(VirtualHost.DESIRED_STATE, State.ACTIVE));
assertEquals("Unexpected state", State.ACTIVE, host.getState());
+ host.close();
}
public void testStartInErrorStateAfterOpen() throws Exception
@@ -247,5 +255,6 @@ public class AbstractVirtualHostTest ext
host.start();
assertEquals("Unexpected state", State.ACTIVE, host.getState());
+ host.close();
}
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
Thu Jun 11 15:44:18 2015
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;
import java.util.UUID;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.logging.EventLogger;
@@ -60,7 +61,7 @@ import org.apache.qpid.server.txn.DtxReg
import org.apache.qpid.server.util.Action;
import org.apache.qpid.transport.Xid;
-public class SynchronousMessageStoreRecovererTest extends TestCase
+public class SynchronousMessageStoreRecovererTest extends QpidTestCase
{
private VirtualHostImpl _virtualHost;
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
Thu Jun 11 15:44:18 2015
@@ -102,6 +102,7 @@ public class VirtualHostQueueCreationTes
try
{
_taskExecutor.stopImmediately();
+ _virtualHost.close();
}
finally
{
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
Thu Jun 11 15:44:18 2015
@@ -84,6 +84,13 @@ public class VirtualHostAliasTest extend
}
+ @Override
+ protected void tearDown() throws Exception
+ {
+ _port.close();
+ super.tearDown();
+ }
+
public void testDefaultAliases_VirtualHostNameAlias()
{
VirtualHostImpl vhost = _port.getVirtualHost("red");
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java?rev=1684927&r1=1684926&r2=1684927&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
Thu Jun 11 15:44:18 2015
@@ -124,6 +124,7 @@ public class AbstractStandardVirtualHost
assertEquals("Unexpected virtual host name", TEST_VIRTUAL_HOST_NAME,
virtualHost.getName());
assertEquals("Unexpected virtual host state", State.ACTIVE,
virtualHost.getState());
assertEquals("Unexpected virtual host id", virtualHostId,
virtualHost.getId());
+ node.close();
}
/**
@@ -144,6 +145,7 @@ public class AbstractStandardVirtualHost
VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
assertNull("Virtual host should not be automatically created",
virtualHost);
+ node.close();
}
/**
@@ -176,6 +178,7 @@ public class AbstractStandardVirtualHost
assertNotNull("Unexpected virtual host id", virtualHost.getId());
assertEquals("Initial configuration should be empty", "{}",
node.getVirtualHostInitialConfiguration());
+ node.close();
}
/**
@@ -206,6 +209,7 @@ public class AbstractStandardVirtualHost
VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
assertNull("Virtual host should not be created by blueprint",
virtualHost);
+ node.close();
}
/**
@@ -240,6 +244,7 @@ public class AbstractStandardVirtualHost
assertEquals("Unexpected virtual host name", TEST_VIRTUAL_HOST_NAME,
virtualHost.getName());
assertEquals("Unexpected virtual host state", State.ACTIVE,
virtualHost.getState());
assertEquals("Unexpected virtual host id", virtualHostId,
virtualHost.getId());
+ node.close();
}
public void testStopStartVHN() throws Exception
@@ -261,6 +266,7 @@ public class AbstractStandardVirtualHost
node.start();
assertEquals("Unexpected virtual host node state after start",
State.ACTIVE, node.getState());
+ node.close();
}
@@ -293,6 +299,7 @@ public class AbstractStandardVirtualHost
// PASS
}
assertNull("Description unexpected updated", node.getDescription());
+ node.close();
}
public void testDeleteVHNDeniedByACL() throws Exception
@@ -323,6 +330,7 @@ public class AbstractStandardVirtualHost
}
assertEquals("Virtual host node state changed unexpectedly",
State.ACTIVE, node.getState());
+ node.close();
}
public void testStopVHNDeniedByACL() throws Exception
@@ -353,6 +361,7 @@ public class AbstractStandardVirtualHost
}
assertEquals("Virtual host node state changed unexpectedly",
State.ACTIVE, node.getState());
+ node.close();
}
public void testValidateOnCreateFails_StoreFails() throws Exception
@@ -412,6 +421,7 @@ public class AbstractStandardVirtualHost
node.create();
verify(store, times(2)).openConfigurationStore(node, false); // once
of validation, once for real
verify(store, times(1)).closeConfigurationStore();
+ node.close();
}
public void testOpenFails() throws Exception
@@ -423,6 +433,7 @@ public class AbstractStandardVirtualHost
AbstractVirtualHostNode node = new TestAbstractVirtualHostNode(
_broker, attributes, store);
node.open();
assertEquals("Unexpected node state", State.ERRORED, node.getState());
+ node.close();
}
public void testOpenSucceeds() throws Exception
@@ -457,6 +468,7 @@ public class AbstractStandardVirtualHost
node.open();
assertEquals("Unexpected node state", State.ACTIVE, node.getState());
assertFalse("onExceptionInOpen was called", onFailureFlag.get());
+ node.close();
}
@@ -489,6 +501,7 @@ public class AbstractStandardVirtualHost
node.setAttributes(Collections.<String,
Object>singletonMap(VirtualHostNode.DESIRED_STATE, State.ACTIVE));
assertEquals("Unexpected state", State.ACTIVE, node.getState());
+ node.close();
}
public void testStartInErrorStateAfterOpen() throws Exception
@@ -505,6 +518,7 @@ public class AbstractStandardVirtualHost
node.start();
assertEquals("Unexpected state", State.ACTIVE, node.getState());
+ node.close();
}
private ConfiguredObjectRecord
createVirtualHostConfiguredObjectRecord(UUID virtualHostId)
Modified:
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.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/AclActionTest.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclActionTest.java
Thu Jun 11 15:44:18 2015
@@ -26,8 +26,9 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.access.firewall.FirewallRule;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class AclActionTest extends TestCase
+public class AclActionTest extends QpidTestCase
{
public void testEqualsAndHashCode()
{
Modified:
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.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/AclRulePredicatesTest.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
Thu Jun 11 15:44:18 2015
@@ -26,8 +26,9 @@ import org.apache.qpid.server.security.a
import static org.mockito.Mockito.*;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class AclRulePredicatesTest extends TestCase
+public class AclRulePredicatesTest extends QpidTestCase
{
private AclRulePredicates _aclRulePredicates = new AclRulePredicates();
private FirewallRuleFactory _firewallRuleFactory =
mock(FirewallRuleFactory.class);
Modified:
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.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/ActionTest.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ActionTest.java
Thu Jun 11 15:44:18 2015
@@ -25,8 +25,9 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.access.Operation;
import junit.framework.TestCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class ActionTest extends TestCase
+public class ActionTest extends QpidTestCase
{
private ObjectProperties _properties1 = mock(ObjectProperties.class);
private ObjectProperties _properties2 = mock(ObjectProperties.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
