This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new bc1f841 ARTEMIS-2901 Fixing testsuite on InterruptLargeMessageTest
bc1f841 is described below
commit bc1f841244390b0996dfa7ece20de2e5774dad53
Author: Clebert Suconic <[email protected]>
AuthorDate: Thu Sep 17 09:28:51 2020 -0400
ARTEMIS-2901 Fixing testsuite on InterruptLargeMessageTest
The queue is missing access to the server,
recent changed functionality on temporary queues namespace needed
the server and now the unit test has to pass in the reference to fix the
test.
---
.../integration/client/InterruptedLargeMessageTest.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index d4c73b1..3856681 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -522,9 +522,10 @@ public class InterruptedLargeMessageTest extends
LargeMessageTestBase {
PostOffice postOffice,
StorageManager storageManager,
HierarchicalRepository<AddressSettings>
addressSettingsRepository,
+ ActiveMQServer server,
ArtemisExecutor executor) {
super(id, address, name, filter, pageSubscription != null ?
pageSubscription.getPagingStore() : null, pageSubscription, user, durable,
temporary, autoCreated, scheduledExecutor,
- postOffice, storageManager, addressSettingsRepository,
executor, null, null);
+ postOffice, storageManager, addressSettingsRepository,
executor, server, null);
}
@Override
@@ -549,7 +550,10 @@ public class InterruptedLargeMessageTest extends
LargeMessageTestBase {
final ExecutorFactory execFactory;
- NoPostACKQueueFactory(StorageManager storageManager,
+ final ActiveMQServer server;
+
+ NoPostACKQueueFactory(ActiveMQServer server,
+ StorageManager storageManager,
PostOffice postOffice,
ScheduledExecutorService scheduledExecutor,
HierarchicalRepository<AddressSettings>
addressSettingsRepository,
@@ -559,16 +563,17 @@ public class InterruptedLargeMessageTest extends
LargeMessageTestBase {
this.scheduledExecutor = scheduledExecutor;
this.addressSettingsRepository = addressSettingsRepository;
this.execFactory = execFactory;
+ this.server = server;
}
@Override
public Queue createQueueWith(final QueueConfig config) {
- return new NoPostACKQueue(config.id(), config.address(),
config.name(), config.filter(), config.user(), config.pageSubscription(),
config.isDurable(), config.isTemporary(), config.isAutoCreated(),
scheduledExecutor, postOffice, storageManager, addressSettingsRepository,
execFactory.getExecutor());
+ return new NoPostACKQueue(config.id(), config.address(),
config.name(), config.filter(), config.user(), config.pageSubscription(),
config.isDurable(), config.isTemporary(), config.isAutoCreated(),
scheduledExecutor, postOffice, storageManager, addressSettingsRepository,
server, execFactory.getExecutor());
}
@Override
public Queue createQueueWith(QueueConfiguration config, PagingManager
pagingManager) throws Exception {
- return new NoPostACKQueue(config.getId(), config.getAddress(),
config.getName(), FilterImpl.createFilter(config.getFilterString()),
config.getUser(), QueueFactoryImpl.getPageSubscription(config, pagingManager),
config.isDurable(), config.isTemporary(), config.isAutoCreated(),
scheduledExecutor, postOffice, storageManager, addressSettingsRepository,
execFactory.getExecutor());
+ return new NoPostACKQueue(config.getId(), config.getAddress(),
config.getName(), FilterImpl.createFilter(config.getFilterString()),
config.getUser(), QueueFactoryImpl.getPageSubscription(config, pagingManager),
config.isDurable(), config.isTemporary(), config.isAutoCreated(),
scheduledExecutor, postOffice, storageManager, addressSettingsRepository,
server, execFactory.getExecutor());
}
@Deprecated
@@ -583,7 +588,7 @@ public class InterruptedLargeMessageTest extends
LargeMessageTestBase {
boolean temporary,
boolean autoCreated) {
- return new NoPostACKQueue(persistenceID, address, name, filter,
user, pageSubscription, durable, temporary, autoCreated, scheduledExecutor,
postOffice, storageManager, addressSettingsRepository,
execFactory.getExecutor());
+ return new NoPostACKQueue(persistenceID, address, name, filter,
user, pageSubscription, durable, temporary, autoCreated, scheduledExecutor,
postOffice, storageManager, addressSettingsRepository, server,
execFactory.getExecutor());
}
/* (non-Javadoc)
@@ -604,7 +609,7 @@ public class InterruptedLargeMessageTest extends
LargeMessageTestBase {
QueueFactory original = server.getQueueFactory();
- ((ActiveMQServerImpl) server).replaceQueueFactory(new
NoPostACKQueueFactory(server.getStorageManager(), server.getPostOffice(),
server.getScheduledPool(), server.getAddressSettingsRepository(),
server.getExecutorFactory()));
+ ((ActiveMQServerImpl) server).replaceQueueFactory(new
NoPostACKQueueFactory(server, server.getStorageManager(),
server.getPostOffice(), server.getScheduledPool(),
server.getAddressSettingsRepository(), server.getExecutorFactory()));
locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true);
