Merge pull request #3062 from chanikag/jmstestissue

Fix intermittent test failure
wso2 · Dec 20, 2023 · 954f503 · 954f503
2 parents d14870d + 9c5cde0
commit 954f503
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...in/java/org/wso2/esb/integration/common/extensions/jmsserver/ActiveMQServerExtension.java b/...in/java/org/wso2/esb/integration/common/extensions/jmsserver/ActiveMQServerExtension.java
@@ -66,4 +66,8 @@ public static void stopMQServer() {
         activeMqBroker.stop();
 
     }
+
+    public static boolean isMQServerStarted() {
+        return activeMqBroker.isBrokerStarted();
+    }
 }
diff --git a/...transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java b/...transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java
@@ -22,10 +22,13 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
+import org.wso2.carbon.automation.extensions.servers.jmsserver.controller.config.JMSBrokerConfigurationProvider;
 import org.wso2.carbon.automation.extensions.servers.tomcatserver.TomcatServerManager;
 import org.wso2.carbon.automation.extensions.servers.tomcatserver.TomcatServerType;
 import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil;
 import org.wso2.carbon.automation.test.utils.http.client.HttpResponse;
+import org.wso2.carbon.esb.jms.utils.JMSBroker;
+import org.wso2.esb.integration.common.extensions.jmsserver.ActiveMQServerExtension;
 import org.wso2.esb.integration.common.utils.CarbonLogReader;
 import org.wso2.esb.integration.common.utils.ESBIntegrationTest;
 import org.wso2.esb.integration.services.jaxrs.customersample.CustomerConfig;
@@ -52,6 +55,9 @@ public class MSMPCronForwarderCase extends ESBIntegrationTest {
     protected void init() throws Exception {
         // START THE ESB
         super.init();
+        if (!ActiveMQServerExtension.isMQServerStarted()) {
+            ActiveMQServerExtension.startMQServer();
+        }
         carbonLogReader.start();
     }