Merge branch 'wso2-master' into test-merge

modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java

@@ -106,16 +106,20 @@ public class CarbonServerManagerExtension {
                         .automationContext.getInstance().getHosts().get("default"));
                 long time = System.currentTimeMillis() + 60000L;
 
-                while(true) {
-                    if(this.inputStreamHandler.getOutput().contains("Mgt Console URL") || System.currentTimeMillis() >= time) {
-                        int httpsPort = defaultHttpsPort + this.portOffset;
-                        String backendURL = this.automationContext.getContextUrls().getSecureServiceUrl().replaceAll("(:\\d+)", ":" + httpsPort);
-                        User superUser = this.automationContext.getSuperTenant().getTenantAdmin();
-                        ClientConnectionUtil.waitForLogin(backendURL, superUser);
-                        log.info("Server started successfully.");
-                        break;
-                    }
-                }
+//                while(true) {
+//                    if(this.inputStreamHandler.getOutput().contains("Mgt Console URL") || System.currentTimeMillis() >= time) {
+//                        int httpsPort = defaultHttpsPort + this.portOffset;
+//                        String backendURL = this.automationContext.getContextUrls().getSecureServiceUrl().replaceAll("(:\\d+)", ":" + httpsPort);
+//                        User superUser = this.automationContext.getSuperTenant().getTenantAdmin();
+//                        ClientConnectionUtil.waitForLogin(backendURL, superUser);
+//                        log.info("Server started successfully.");
+//                        break;
+//                    }
+//                }
+                int httpsPort = defaultHttpsPort + this.portOffset;
+                String backendURL = this.automationContext.getContextUrls().getSecureServiceUrl().replaceAll("(:\\d+)", ":" + httpsPort);
+                User superUser = this.automationContext.getSuperTenant().getTenantAdmin();
+                ClientConnectionUtil.waitForLogin(backendURL, superUser);
             } catch (XPathExpressionException | IOException var13) {
                 throw new IllegalStateException("Unable to start server", var13);
             }
@@ -212,9 +216,9 @@ public class CarbonServerManagerExtension {
 
                 long time = System.currentTimeMillis() + 300000L;
 
-                while(!this.inputStreamHandler.getOutput().contains("Halting JVM") && System.currentTimeMillis() < time) {
-                    ;
-                }
+//                while(!this.inputStreamHandler.getOutput().contains("Halting JVM") && System.currentTimeMillis() < time) {
+//                    ;
+//                }
 
                 log.info("Server stopped successfully...");
             }
@@ -261,9 +265,9 @@ public class CarbonServerManagerExtension {
 
         long time = System.currentTimeMillis() + 300000L;
 
-        while(!this.inputStreamHandler.getOutput().contains("Halting JVM") && System.currentTimeMillis() < time) {
-            ;
-        }
+//        while(!this.inputStreamHandler.getOutput().contains("Halting JVM") && System.currentTimeMillis() < time) {
+//            ;
+//        }
 
         time = System.currentTimeMillis();
 

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java

@@ -60,8 +60,7 @@ public class MobileDeviceManagementWithNoDevices extends TestBase {
             TimeUnit.SECONDS.sleep(5);
             long WAIT_TIME = 40000;
             if (System.currentTimeMillis() - startTime > WAIT_TIME) {
-                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " ms time-out has "
-                        + "happened");
+                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " time-out has happened");
             }
         }
     }

modules/integration/tests-integration/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPIAdditionalPermutations.jmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.2">
+<jmeterTestPlan version="1.2" properties="2.9" jmeter="3.0 r1743807">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Android Device Management API" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -10206,7 +10206,15 @@ vars.put(&quot;base64encodedId&quot;,new String(encryptedId));</stringProp>
         </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Device Management Call 131" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="limit" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">100</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">limit</stringProp>
+              </elementProp>
+            </collectionProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain">${host}</stringProp>
           <stringProp name="HTTPSampler.port">${https_port}</stringProp>