You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/19 21:17:45 UTC
[1/3] activemq-artemis git commit: Ensure tests use proper directory
Repository: activemq-artemis
Updated Branches:
refs/heads/master 892675f02 -> 50c3dda87
Ensure tests use proper directory
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d24f2eb1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d24f2eb1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d24f2eb1
Branch: refs/heads/master
Commit: d24f2eb10f367c18014ff6dac1c389a2c7ea3254
Parents: 892675f
Author: jbertram <jb...@apache.org>
Authored: Tue May 19 11:11:47 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue May 19 11:31:11 2015 -0500
----------------------------------------------------------------------
.../extras/byteman/ReplicationBackupTest.java | 13 +++----
.../AutomaticColocatedQuorumVoteTest.java | 29 +++++++-------
.../cluster/failover/FailoverTestBase.java | 9 ++---
...ultipleLivesMultipleBackupsFailoverTest.java | 29 +++++++-------
.../SingleLiveMultipleBackupsFailoverTest.java | 27 +++++++------
.../replication/ReplicationTest.java | 40 ++++++++++----------
6 files changed, 70 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
index ea0e6f8..aa8165c 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.activemq.artemis.tests.extras.byteman;
-import java.util.concurrent.CountDownLatch;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
@@ -31,6 +28,8 @@ import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.concurrent.CountDownLatch;
+
@RunWith(BMUnitRunner.class)
public class ReplicationBackupTest extends ServiceTestBase
{
@@ -67,10 +66,10 @@ public class ReplicationBackupTest extends ServiceTestBase
final String suffix = "_backup";
Configuration backupConfig = createDefaultConfig()
- .setBindingsDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
- .setJournalDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
- .setPagingDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
- .setLargeMessagesDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix);
+ .setBindingsDirectory(getBindingsDir() + suffix)
+ .setJournalDirectory(getJournalDir() + suffix)
+ .setPagingDirectory(getPageDir() + suffix)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + suffix);
Configuration liveConfig = createDefaultConfig();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
index ee2edbb..07f749a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
@@ -16,20 +16,10 @@
*/
package org.apache.activemq.artemis.tests.integration.cluster.failover;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
import org.apache.activemq.artemis.core.client.impl.Topology;
import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
import org.apache.activemq.artemis.core.config.Configuration;
@@ -42,11 +32,20 @@ import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfigu
import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
@RunWith(value = Parameterized.class)
public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
{
@@ -314,10 +313,10 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
.clearAcceptorConfigurations()
.addAcceptorConfiguration(liveAcceptor)
.addConnectorConfiguration(liveConnector.getName(), liveConnector)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + identity)
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + identity)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + identity)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + identity)
+ .setJournalDirectory(getJournalDir() + identity)
+ .setBindingsDirectory(getBindingsDir() + identity)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + identity)
+ .setPagingDirectory(getPageDir() + identity)
.addQueueConfiguration(new CoreQueueConfiguration()
.setAddress("jms.queue.testQueue")
.setName("jms.queue.testQueue"));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
index 0b1aa00..a93a6f2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -207,11 +207,10 @@ public abstract class FailoverTestBase extends ServiceTestBase
ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, null);
- final String suffix = "_backup";
- backupConfig.setBindingsDirectory(backupConfig.getBindingsDirectory() + suffix)
- .setJournalDirectory(backupConfig.getJournalDirectory() + suffix)
- .setPagingDirectory(backupConfig.getPagingDirectory() + suffix)
- .setLargeMessagesDirectory(backupConfig.getLargeMessagesDirectory() + suffix)
+ backupConfig.setBindingsDirectory(getBindingsDir(0, true))
+ .setJournalDirectory(getJournalDir(0, true))
+ .setPagingDirectory(getPageDir(0, true))
+ .setLargeMessagesDirectory(getLargeMessagesDir(0, true))
.setSecurityEnabled(false);
setupHAPolicyConfiguration();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
index d60da9c..5e1b641 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
@@ -16,16 +16,9 @@
*/
package org.apache.activemq.artemis.tests.integration.cluster.failover;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
import org.apache.activemq.artemis.core.config.Configuration;
@@ -36,9 +29,15 @@ import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfigur
import org.apache.activemq.artemis.core.server.NodeManager;
import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
import org.junit.After;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
*/
public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFailoverTestBase
@@ -164,10 +163,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
.addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty())))
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicaPolicyConfiguration())
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+ .setBindingsDirectory(getBindingsDir() + "_" + liveNode)
+ .setJournalDirectory(getJournalDir() + "_" + liveNode)
+ .setPagingDirectory(getPageDir() + "_" + liveNode)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + "_" + liveNode);
for (int node : otherBackupNodes)
{
@@ -199,10 +198,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
.addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty())))
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode)
+ .setBindingsDirectory(getBindingsDir() + "_" + liveNode)
+ .setJournalDirectory(getJournalDir() + "_" + liveNode)
+ .setPagingDirectory(getPageDir() + "_" + liveNode)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + "_" + liveNode)
.addConnectorConfiguration(liveConnector.getName(), liveConnector);
List<String> pairs = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
index 2de81b6..f0a34af 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
@@ -16,12 +16,6 @@
*/
package org.apache.activemq.artemis.tests.integration.cluster.failover;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
@@ -39,6 +33,11 @@ import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer
import org.junit.After;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
*/
public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailoverTestBase
@@ -142,10 +141,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicatedPolicyConfiguration())
.addConnectorConfiguration(backupConnector.getName(), backupConnector)
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+ .setBindingsDirectory(getBindingsDir() + "_" + liveNode)
+ .setJournalDirectory(getJournalDir() + "_" + liveNode)
+ .setPagingDirectory(getPageDir() + "_" + liveNode)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + "_" + liveNode);
List<String> staticConnectors = new ArrayList<String>();
@@ -171,10 +170,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
.setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
.addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName()))
.addConnectorConfiguration(liveConnector.getName(), liveConnector)
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+ .setBindingsDirectory(getBindingsDir() + "_" + liveNode)
+ .setJournalDirectory(getJournalDir() + "_" + liveNode)
+ .setPagingDirectory(getPageDir() + "_" + liveNode)
+ .setLargeMessagesDirectory(getLargeMessagesDir() + "_" + liveNode);
servers.put(liveNode, new SameProcessActiveMQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode)));
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d24f2eb1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 68cdc0e..ddb0aea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -16,21 +16,6 @@
*/
package org.apache.activemq.artemis.tests.integration.replication;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.ActiveMQException;
@@ -85,14 +70,28 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils;
import org.apache.activemq.artemis.tests.util.ServiceTestBase;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
-import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
public final class ReplicationTest extends ServiceTestBase
{
@@ -140,15 +139,14 @@ public final class ReplicationTest extends ServiceTestBase
backupAcceptor = TransportConfigurationUtils.getInVMAcceptor(false);
}
- final String suffix = "_backup";
Configuration liveConfig = createDefaultConfig();
Configuration backupConfig = createDefaultConfig()
.setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration())
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix)
+ .setBindingsDirectory(getBindingsDir(0, true))
+ .setJournalDirectory(getJournalDir(0, true))
+ .setPagingDirectory(getPageDir(0, true))
+ .setLargeMessagesDirectory(getLargeMessagesDir(0, true))
.setIncomingInterceptorClassNames(incomingInterceptors.length > 0 ? Arrays.asList(incomingInterceptors) : new ArrayList<String>());
ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, liveAcceptor);
[3/3] activemq-artemis git commit: This closes #268 on test changes
Posted by cl...@apache.org.
This closes #268 on test changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/50c3dda8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/50c3dda8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/50c3dda8
Branch: refs/heads/master
Commit: 50c3dda87168a7c6a6939d3dea09be006aeaea90
Parents: 892675f 63f7837
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 19 15:17:10 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 19 15:17:10 2015 -0400
----------------------------------------------------------------------
.../extras/byteman/ReplicationBackupTest.java | 13 +++----
.../AutomaticColocatedQuorumVoteTest.java | 29 +++++++-------
.../cluster/failover/FailoverTestBase.java | 9 ++---
...ultipleLivesMultipleBackupsFailoverTest.java | 29 +++++++-------
.../SingleLiveMultipleBackupsFailoverTest.java | 27 +++++++------
.../management/QueueControlTest.java | 1 -
.../replication/ReplicationTest.java | 40 ++++++++++----------
7 files changed, 70 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: Remove unnecessary check
Posted by cl...@apache.org.
Remove unnecessary check
When this test is run from QueueControlUsingCoreTest the connection
count check will fail because of the request/reply semantics of the
test itself.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/63f7837a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/63f7837a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/63f7837a
Branch: refs/heads/master
Commit: 63f7837a4d96531013d335c029fd55f74fa2e6c6
Parents: d24f2eb
Author: jbertram <jb...@apache.org>
Authored: Tue May 19 12:48:46 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue May 19 12:48:46 2015 -0500
----------------------------------------------------------------------
.../artemis/tests/integration/management/QueueControlTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/63f7837a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index e6cb6a0..e3e00c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -539,7 +539,6 @@ public class QueueControlTest extends ManagementTestBase
assertEquals(2, srvqueue.getDeliveringCount());
assertEquals(2, srvqueue.getConsumerCount());
- assertEquals(2, server.getConnectionCount());
System.out.println(queueControl.listDeliveringMessagesAsJSON());