Merge pull request #1825 from milanperera/master-new-1

Fix issues in ESBJAVA4279_MPRetryUponResponseSC_500 test case
wso2 · Feb 2, 2018 · a0ea7cb · a0ea7cb
2 parents 8a09a9d + 2613d44
commit a0ea7cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...t/ESBJAVA4279_MPRetryUponResponseSC_500_withNonRetryStatusCodes_200_and_202_TestCase.java b/...t/ESBJAVA4279_MPRetryUponResponseSC_500_withNonRetryStatusCodes_200_and_202_TestCase.java
@@ -42,8 +42,7 @@ public class ESBJAVA4279_MPRetryUponResponseSC_500_withNonRetryStatusCodes_200_a
                                                                                                extends
                                                                                                ESBIntegrationTest {
     private static final String PROXY_SERVICE_NAME = "NonRetrySCProxy";
-    private static final String EXPECTED_ERROR_MESSAGE =
-                                                         "BlockingMessageSender of message processor [Processor1] failed to send message to the endpoint";
+    private static final String EXPECTED_ERROR_MESSAGE = "Message forwarding failed";
     private static final String EXPECTED_MP_DEACTIVATION_MSG =
                                                                "Successfully deactivated the message processor [Processor1]";
     private static final int RETRY_COUNT = 4;
@@ -53,9 +52,9 @@ public class ESBJAVA4279_MPRetryUponResponseSC_500_withNonRetryStatusCodes_200_a
     @BeforeClass(alwaysRun = true)
     public void deployeService() throws Exception {
         super.init();
+        activeMQServer.startJMSBroker();
         loadESBConfigurationFromClasspath("/artifacts/ESB/messageProcessorConfig/MessageProcessorRetryUpon_500_ResponseWith_200And_202As_Non_retry_SC.xml");
         isProxyDeployed(PROXY_SERVICE_NAME);
-        activeMQServer.startJMSBroker();
     }
 
     @Test(groups = { "wso2.esb" }, description = "Test whether a Message Processor retries sending the message to the EP when the response status code is 500 and MP is configured with 200,202 as non-retry status codes.")

diff --git a/...eProcessorConfig/MessageProcessorRetryUpon_500_ResponseWith_200And_202As_Non_retry_SC.xml b/...eProcessorConfig/MessageProcessorRetryUpon_500_ResponseWith_200And_202As_Non_retry_SC.xml
@@ -14,7 +14,7 @@
                       value="true"
                       scope="axis2"
                       type="STRING"/>
-            <property name="OUT_ONLY" value="true" scope="default" type="STRING"/>
+            <!--property name="OUT_ONLY" value="true" scope="default" type="STRING"/-->
             <store messageStore="JMSMS"/>
          </inSequence>
       </target>
@@ -54,6 +54,8 @@
                      targetEndpoint="EP"
                      messageStore="JMSMS">
       <parameter name="client.retry.interval">2000</parameter>
+      <parameter name="max.store.connection.attempts">-1</parameter>
+      <parameter name="store.connection.retry.interval">1000</parameter>
       <parameter name="max.delivery.attempts">4</parameter>
       <parameter name="interval">4000</parameter>
       <parameter name="non.retry.status.codes">200,202</parameter>