Author: rgodfrey
Date: Fri Apr 25 14:44:43 2014
New Revision: 1590044
URL: http://svn.apache.org/r1590044
Log:
QPID-5578 : Make TaskExecutor an interface and provide a test-only current
thread implementation
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1590044&r1=1590043&r2=1590044&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
Fri Apr 25 14:44:43 2014
@@ -38,6 +38,7 @@ import org.apache.qpid.framing.FieldTabl
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.exchange.DirectExchange;
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.TopicExchange;
@@ -120,7 +121,7 @@ public class VirtualHostMessageStoreTest
cleanup(new File(_storePath));
Broker<?> broker = BrokerTestHelper.createBrokerMock();
- _taskExecutor = new TaskExecutor();
+ _taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
when(broker.getTaskExecutor()).thenReturn(_taskExecutor);
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1590044&r1=1590043&r2=1590044&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Fri Apr 25 14:44:43 2014
@@ -62,14 +62,12 @@ import org.apache.qpid.server.Broker;
import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.util.FileUtils;
import org.apache.qpid.util.SystemUtils;
@@ -232,7 +230,7 @@ public class QpidBrokerTestCase extends
int actualPort = getPort(port);
if(_taskExecutor == null)
{
- _taskExecutor = new TaskExecutor();
+ _taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
}
TestBrokerConfiguration configuration = new
TestBrokerConfiguration(System.getProperty(_brokerStoreType),
_configFile.getAbsolutePath(), _taskExecutor);
@@ -345,7 +343,7 @@ public class QpidBrokerTestCase extends
protected void setUp() throws Exception
{
super.setUp();
- _taskExecutor = new TaskExecutor();
+ _taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
if (!_configFile.exists())
{
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1590044&r1=1590043&r2=1590044&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Fri Apr 25 14:44:43 2014
@@ -36,9 +36,7 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.PreferencesProvider;
@@ -75,15 +73,14 @@ public class TestBrokerConfiguration
private MemoryConfigurationEntryStore _store;
private boolean _saved;
- public TestBrokerConfiguration(String storeType, String
intialStoreLocation, final TaskExecutor taskExecutor)
+ public TestBrokerConfiguration(String storeType, String
initialStoreLocation, final TaskExecutor taskExecutor)
{
_store = new MemoryConfigurationEntryStore(
new SystemContextImpl(taskExecutor,
- new
ConfiguredObjectFactoryImpl(BrokerModel.getInstance()),
mock(EventLogger.class),
mock(LogRecorder.class),
mock(BrokerOptions.class)),
- intialStoreLocation,
+ initialStoreLocation,
null,
Collections.<String,String>emptyMap());
_store.visitConfiguredObjectRecords(new ConfiguredObjectRecordHandler()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
