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

AMQ-7118 ensure message size and usage is constant for the test, fix failure

This commit is contained in:
gtully 2019-09-20 10:00:33 +01:00
parent 501d55337a
commit e8e27f0b16
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ7118Test.java
View File

@ -16,11 +16,9 @@
*/ */
package org.apache.activemq.bugs; package org.apache.activemq.bugs;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ConnectionId;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -53,7 +51,6 @@ public class AMQ7118Test {
private final String xbean = "xbean:"; private final String xbean = "xbean:";
private final String confBase = "src/test/resources/org/apache/activemq/bugs/amq7118"; private final String confBase = "src/test/resources/org/apache/activemq/bugs/amq7118";
int checkpointIndex = 0; int checkpointIndex = 0;
protected long idGenerator;
private static final ActiveMQConnectionFactory ACTIVE_MQ_CONNECTION_FACTORY = new ActiveMQConnectionFactory(WIRE_LEVEL_ENDPOINT); private static final ActiveMQConnectionFactory ACTIVE_MQ_CONNECTION_FACTORY = new ActiveMQConnectionFactory(WIRE_LEVEL_ENDPOINT);
@ -61,6 +58,7 @@ public class AMQ7118Test {
public void setup() throws Exception { public void setup() throws Exception {
deleteData(new File("target/data")); deleteData(new File("target/data"));
createBroker(); createBroker();
ACTIVE_MQ_CONNECTION_FACTORY.setConnectionIDPrefix("bla");
} }
@After @After
@ -70,10 +68,6 @@ public class AMQ7118Test {
public void setupProducerConnection() throws Exception { public void setupProducerConnection() throws Exception {
producerConnection = ACTIVE_MQ_CONNECTION_FACTORY.createConnection(); producerConnection = ACTIVE_MQ_CONNECTION_FACTORY.createConnection();
//Small hack to be sure the message IDs are the same across platforms when testing
((ActiveMQConnection)producerConnection).getConnectionInfo().setConnectionId(new ConnectionId("connection:" + (++idGenerator)));
producerConnection.start(); producerConnection.start();
pSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); pSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
} }
@ -139,11 +133,11 @@ public class AMQ7118Test {
LOG.info("All messages Consumed."); LOG.info("All messages Consumed.");
//Clean up the log files and be sure its stable //Clean up the log files and be sure its stable
checkFiles(true, 2, "db-33.log"); checkFiles(true, 2, "db-30.log");
checkFiles(true, 3, "db-34.log"); checkFiles(true, 3, "db-31.log");
checkFiles(true, 2, "db-34.log"); checkFiles(true, 2, "db-31.log");
checkFiles(true, 2, "db-34.log"); checkFiles(true, 2, "db-31.log");
checkFiles(true, 2, "db-34.log"); checkFiles(true, 2, "db-31.log");
broker.stop(); broker.stop();
broker.waitUntilStopped(); broker.waitUntilStopped();

2
activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq7118/activemq.xml
View File

@ -24,7 +24,7 @@
<!-- <!--
The <broker> element is used to configure the ActiveMQ broker. The <broker> element is used to configure the ActiveMQ broker.
--> -->
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="target/data"> <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" brokerId="brokerId" dataDirectory="target/data">
<destinationPolicy> <destinationPolicy>
<policyMap> <policyMap>