Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0

README.md

@@ -7,7 +7,7 @@
 # Welcome to WSO2 IoT Server
 
 <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
-<a href='https://wso2.org/jenkins/job/products/job/product-iots__java8/'><img src='https://wso2.org/jenkins/job/products/job/product-iots__java8/badge/icon'></a> - Java8
+<a href='https://wso2.org/jenkins/job/products/job/product-iots__java8/'><img src='https://wso2.org/jenkins/job/products/job/product-iots/badge/icon'></a>
 
 WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.
 

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

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