Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA fixing tests

This commit is contained in:
Clebert Suconic 2019-08-22 11:59:44 -04:00
parent 777eede7ab
commit 3d7042d49a
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
View File

@ -186,7 +186,7 @@ public class FailoverTest extends FailoverTestBase {
ClientSessionFactoryInternal sf1 = (ClientSessionFactoryInternal) createSessionFactory(locator);
final ClientSession session = createSession(sf1, true, true);
final ClientSession session = createSession(sf1, true, false);
session.createQueue(FailoverTestBase.ADDRESS, RoutingType.MULTICAST, FailoverTestBase.ADDRESS, null, true);
@ -218,7 +218,13 @@ public class FailoverTest extends FailoverTestBase {
log.debug("acking message = id = " + message.getMessageID() + ", counter = " +
message.getIntProperty("counter"));
message.acknowledge();
session.commit();
} catch (ActiveMQException e) {
try {
session.rollback();
} catch (Exception e2) {
e.printStackTrace();
}
e.printStackTrace();
return;
}

11
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
View File

@ -46,6 +46,7 @@ import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Wait;
import org.junit.Assert;
import org.junit.Test;
@ -414,16 +415,24 @@ public class ReconnectTest extends ActiveMQTestBase {
ClientConsumer clientConsumer2 = session.createConsumer(queueName1);
clientConsumer1.close();
Wait.assertEquals(1, () -> getConsumerCount(server, session));
Set<ServerConsumer> serverConsumers = server.getSessionByID(session.getName()).getServerConsumers();
ServerConsumer serverConsumer = serverConsumers.iterator().next();
assertEquals(1, serverConsumers.size());
assertEquals(clientConsumer2.getConsumerContext().getId(), serverConsumer.getID());
session.close();
sf.close();
server.stop();
}
private int getConsumerCount(ActiveMQServer server, ClientSessionInternal session) {
Set<ServerConsumer> serverConsumers = server.getSessionByID(session.getName()).getServerConsumers();
return serverConsumers.size();
}
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java
View File

@ -266,7 +266,7 @@ public class SharedNothingReplicationFlowControlTest extends ActiveMQTestBase {
PageStoreFactoryTestable testablePageStoreFactory = (PageStoreFactoryTestable) ((PagingManagerImpl) backupServer.getPagingManager()).getPagingStoreFactory();
Assert.assertEquals(openCount.get(), closeCount.get());
Wait.assertTrue(() -> openCount.get() == closeCount.get());
}
static AtomicInteger openCount = new AtomicInteger(0);