Skip to content

Commit b4058b1

Browse files
committed
AMQ-XX: Fix long running test on CI
1 parent 0b58755 commit b4058b1

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
package org.apache.activemq.store.kahadb;
1919

20-
import java.io.File;
21-
import java.io.IOException;
22-
import java.util.LinkedList;
23-
import java.util.List;
24-
20+
import jakarta.jms.Connection;
21+
import jakarta.jms.JMSException;
22+
import jakarta.jms.MessageConsumer;
23+
import jakarta.jms.MessageProducer;
24+
import jakarta.jms.Session;
25+
import jakarta.jms.TextMessage;
2526
import org.apache.activemq.ActiveMQConnectionFactory;
2627
import org.apache.activemq.broker.BrokerService;
2728
import org.apache.activemq.command.ActiveMQQueue;
@@ -30,20 +31,18 @@
3031
import org.apache.activemq.store.MessageRecoveryContext;
3132
import org.apache.activemq.store.MessageRecoveryListener;
3233
import org.apache.activemq.store.MessageStore;
34+
import org.apache.activemq.util.IOHelper;
3335
import org.junit.After;
34-
import org.junit.Before;
3536
import org.junit.Rule;
3637
import org.junit.Test;
3738
import org.junit.rules.TestName;
3839
import org.slf4j.Logger;
3940
import org.slf4j.LoggerFactory;
4041

41-
import jakarta.jms.Connection;
42-
import jakarta.jms.JMSException;
43-
import jakarta.jms.MessageConsumer;
44-
import jakarta.jms.MessageProducer;
45-
import jakarta.jms.Session;
46-
import jakarta.jms.TextMessage;
42+
import java.io.File;
43+
import java.io.IOException;
44+
import java.util.LinkedList;
45+
import java.util.List;
4746

4847
import static org.junit.Assert.assertEquals;
4948

@@ -57,16 +56,6 @@ public class KahaDBOffsetRecoveryListenerTest {
5756
@Rule
5857
public TestName testName = new TestName();
5958

60-
protected final int PRETEST_MSG_COUNT = 17531;
61-
62-
@Before
63-
public void beforeEach() throws Exception {
64-
// Send+Recv a odd number of messages beyond cache sizes
65-
// to confirm the queue's sequence number gets pushed off
66-
sendMessages(PRETEST_MSG_COUNT, testName.getMethodName());
67-
assertEquals(Integer.valueOf(PRETEST_MSG_COUNT), Integer.valueOf(receiveMessages(testName.getMethodName())));
68-
}
69-
7059
@After
7160
public void afterEach() {
7261
brokerService = null;
@@ -85,7 +74,7 @@ protected BrokerService createBroker(KahaDBStore kaha) throws Exception {
8574
private KahaDBStore createStore(boolean delete) throws IOException {
8675
KahaDBStore kaha = new KahaDBStore();
8776
kaha.setJournalMaxFileLength(1024*100);
88-
kaha.setDirectory(new File("target" + File.separator + "activemq-data" + File.separator + "kahadb-recovery-tests"));
77+
kaha.setDirectory(new File(IOHelper.getDefaultDataDirectory(), "kahadb-recovery-tests"));
8978
if( delete ) {
9079
kaha.deleteAllMessages();
9180
}

0 commit comments

Comments
 (0)