From 926e70ce9fdb4616cda00ec6f6fc3bbc0124d247 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 13 Mar 2015 23:38:32 +0000 Subject: QPID-6450 : [Java Broker] Allow separate model configuration threads for each virtual host node git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666609 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java | 3 +++ .../virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java | 5 ++++- .../virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java | 2 ++ .../server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) (limited to 'qpid/java/bdbstore') diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java index 92da465dbd..24a2ddb071 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java @@ -53,6 +53,8 @@ public class BDBVirtualHostImplTest extends QpidTestCase TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); when(broker.getTaskExecutor()).thenReturn(taskExecutor); + when(broker.getChildExecutor()).thenReturn(taskExecutor); + _storePath = TestFileUtils.createTestDirectory(); @@ -60,6 +62,7 @@ public class BDBVirtualHostImplTest extends QpidTestCase when(_node.getParent(Broker.class)).thenReturn(broker); when(_node.getModel()).thenReturn(BrokerModel.getInstance()); when(_node.getTaskExecutor()).thenReturn(taskExecutor); + when(_node.getChildExecutor()).thenReturn(taskExecutor); when(_node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class)); when(_node.getId()).thenReturn(UUID.randomUUID()); } diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java index cb9d02c767..4fe2bdc97f 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java @@ -63,6 +63,7 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase _taskExecutor = new CurrentThreadTaskExecutor(); _taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); _virtualHostNode = mock(BDBHAVirtualHostNode.class); _configStore = mock(DurableConfigurationStore.class); @@ -74,6 +75,8 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase ConfiguredObjectFactory objectFactory = _broker.getObjectFactory(); when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel()); when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor); + when(_virtualHostNode.getChildExecutor()).thenReturn(_taskExecutor); + } public void testUpdateRole() @@ -154,4 +157,4 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase } -} \ No newline at end of file +} diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java index 0dc72acdb9..9d0e905fc5 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java @@ -79,6 +79,8 @@ public class BDBHAVirtualHostNodeTestHelper _taskExecutor = new TaskExecutorImpl(); _taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); + _bdbStorePath = new File(QpidTestCase.TMP_FOLDER, _testName + "." + System.currentTimeMillis()); _bdbStorePath.deleteOnExit(); diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java index 6608312088..812d9a3b19 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java @@ -29,6 +29,7 @@ import java.util.UUID; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; +import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.test.utils.QpidTestCase; @@ -45,7 +46,9 @@ public class BDBVirtualHostNodeTest extends QpidTestCase { super.setUp(); _broker = BrokerTestHelper.createBrokerMock(); - when(_broker.getTaskExecutor()).thenReturn(CurrentThreadTaskExecutor.newStartedInstance()); + TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); + when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); _storePath = TestFileUtils.createTestDirectory(); } -- cgit v1.2.1