This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 695980db23 [AMQ-9817] Fix long-running test on CI (#1555)
695980db23 is described below
commit 695980db237febe92689a6446ee67ec67319a414
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Fri Dec 12 10:03:52 2025 +0100
[AMQ-9817] Fix long-running test on CI (#1555)
---
.../kahadb/KahaDBOffsetRecoveryListenerTest.java | 35 ++++++++--------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
index 613b620d72..6a84aef5ba 100644
---
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
@@ -17,11 +17,12 @@
package org.apache.activemq.store.kahadb;
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
@@ -30,20 +31,18 @@ import org.apache.activemq.command.MessageId;
import org.apache.activemq.store.MessageRecoveryContext;
import org.apache.activemq.store.MessageRecoveryListener;
import org.apache.activemq.store.MessageStore;
+import org.apache.activemq.util.IOHelper;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.jms.Connection;
-import jakarta.jms.JMSException;
-import jakarta.jms.MessageConsumer;
-import jakarta.jms.MessageProducer;
-import jakarta.jms.Session;
-import jakarta.jms.TextMessage;
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -57,16 +56,6 @@ public class KahaDBOffsetRecoveryListenerTest {
@Rule
public TestName testName = new TestName();
- protected final int PRETEST_MSG_COUNT = 17531;
-
- @Before
- public void beforeEach() throws Exception {
- // Send+Recv a odd number of messages beyond cache sizes
- // to confirm the queue's sequence number gets pushed off
- sendMessages(PRETEST_MSG_COUNT, testName.getMethodName());
- assertEquals(Integer.valueOf(PRETEST_MSG_COUNT),
Integer.valueOf(receiveMessages(testName.getMethodName())));
- }
-
@After
public void afterEach() {
brokerService = null;
@@ -85,7 +74,7 @@ public class KahaDBOffsetRecoveryListenerTest {
private KahaDBStore createStore(boolean delete) throws IOException {
KahaDBStore kaha = new KahaDBStore();
kaha.setJournalMaxFileLength(1024*100);
- kaha.setDirectory(new File("target" + File.separator + "activemq-data"
+ File.separator + "kahadb-recovery-tests"));
+ kaha.setDirectory(new File(IOHelper.getDefaultDataDirectory(),
"kahadb-recovery-tests"));
if( delete ) {
kaha.deleteAllMessages();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
