diff --git a/tests/integration/jms/pom.xml b/tests/integration/jms/pom.xml
index 91240de7d07..04814136221 100644
--- a/tests/integration/jms/pom.xml
+++ b/tests/integration/jms/pom.xml
@@ -38,6 +38,11 @@
io.helidon.microprofile.messaging
helidon-microprofile-messaging
+
+ io.helidon.logging
+ helidon-logging-jul
+ test
+
io.helidon.messaging
helidon-messaging-jms-shim
diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractJmsTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractJmsTest.java
index 1844e038942..b61b8f24e5c 100644
--- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractJmsTest.java
+++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractJmsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
public class AbstractJmsTest {
- static final String BROKER_URL = "vm://localhost?broker.persistent=false";
+ static final String BROKER_URL = "vm://localhost?broker.persistent=true";
static Session session;
static ConnectionFactory connectionFactory;
diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java
index 2d4e7c3250a..731a8f73bb0 100644
--- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java
+++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java
@@ -58,7 +58,7 @@
})
@AddConfigs({
@AddConfig(key = "mp.messaging.connector.helidon-jms.jndi.env-properties.java.naming.provider.url",
- value = "vm://localhost?broker.persistent=false"),
+ value = "vm://localhost?broker.persistent=true"),
@AddConfig(key = "mp.messaging.connector.helidon-jms.jndi.env-properties.java.naming.factory.initial",
value = "org.apache.activemq.jndi.ActiveMQInitialContextFactory"),
@@ -101,18 +101,19 @@ void resendAckTestPart1(SeContainer cdi) {
List testData = List.of("0", "1", "2", "NO_ACK-1", "NO_ACK-2", "NO_ACK-3");
produce(TEST_QUEUE_ACK, testData, m -> {});
mockConnector.outgoing("mock-conn-channel", String.class)
- .awaitPayloads(Duration.ofSeconds(5), testData.toArray(String[]::new));
+ .awaitPayloads(Duration.ofMinutes(1), testData.toArray(String[]::new));
}
@Test
@Order(2)
void resendAckTestPart2(SeContainer cdi) {
- MockConnector mockConnector = cdi.select(MockConnector.class, TEST_CONNECTOR_ANNOTATION).get();
+ MockConnector mockConnector = cdi.select(MockConnector.class, TEST_CONNECTOR_ANNOTATION).get();
- //Check if not acked messages are redelivered
- mockConnector.outgoing("mock-conn-channel", String.class)
- .requestMax()
- .awaitPayloads(Duration.ofSeconds(5), "NO_ACK-1", "NO_ACK-2", "NO_ACK-3");
+ //Check if not acked messages are redelivered
+ mockConnector.outgoing("mock-conn-channel", String.class)
+ .requestMax()
+ .awaitCount(Duration.ofMinutes(1), 1)
+ .awaitPayloads(Duration.ofMinutes(1), "NO_ACK-1", "NO_ACK-2", "NO_ACK-3");
}
@AfterAll
diff --git a/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java b/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java
index 9db39699ed2..0e85591f5f9 100644
--- a/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java
+++ b/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java
@@ -30,8 +30,6 @@
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
@ServerTest
@TestMethodOrder(MethodOrderer.MethodName.class)
@@ -66,7 +64,6 @@ void testConversation100() throws Exception {
}
@Test
- @DisabledOnOs(OS.WINDOWS)
void testConversation1000() throws Exception {
testConversation(WsConversation.createRandom(1000));
}