diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json
index 116aeb3c..20e4bef3 100644
--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@@ -89,6 +89,6 @@
"protocol": ""
},
"queryParameters" : {
- "passBetweenPages" : ["shared"]
+ "passBetweenPages" : ["shared", "owner", "deviceId"]
}
}
\ No newline at end of file
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index f33b2e01..0e081ed9 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -23,7 +23,7 @@
org.wso2.iot
wso2iot-parent
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../../pom.xml
@@ -35,8 +35,8 @@
tests-artifacts
tests-common
- tests-integration
- tests-ui-integration
+
+
tests-iot-web-ui
diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
index e33dc24c..821347eb 100644
--- a/modules/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@@ -22,7 +22,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index d7554600..b914a906 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -22,7 +22,7 @@
org.wso2.iot
tests-common
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 7894bec2..066ecd95 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -22,7 +22,7 @@
org.wso2.iot
tests-common
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index a9d2d3cc..8bb599fe 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -21,7 +21,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index cdc008aa..eac92118 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -24,7 +24,7 @@
org.wso2.iot
tests-common
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml
index 9d76f822..6112b597 100644
--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@@ -24,7 +24,7 @@
org.wso2.iot
tests-common
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-integration-old/pom.xml b/modules/integration/tests-integration-old/pom.xml
index 6c558cce..40c53944 100644
--- a/modules/integration/tests-integration-old/pom.xml
+++ b/modules/integration/tests-integration-old/pom.xml
@@ -23,7 +23,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 6c558cce..40c53944 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -23,7 +23,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 64f14a1e..84e6b404 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -22,7 +22,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
@@ -62,7 +62,7 @@
carbon.zip
- ${basedir}/../../distribution/target/wso2iots-${project.version}.zip
+ ${basedir}/../../distribution/target/wso2iot-${project.version}.zip
@@ -131,7 +131,7 @@
org.wso2.iot
- wso2iots
+ wso2iot
${project.version}
zip
true
@@ -171,7 +171,7 @@
- ${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/resources/security/
+ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
**/*.jks
@@ -192,7 +192,7 @@
- ${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/resources/security/
+ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
**/*.jks
@@ -213,7 +213,7 @@
- ${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/conf/axis2/
+ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/
**/*.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java
new file mode 100644
index 00000000..03bdca0e
--- /dev/null
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.carbon.iot.integration.web.ui.test.extension;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
+import org.wso2.carbon.automation.engine.context.AutomationContext;
+import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
+import org.wso2.carbon.automation.engine.context.TestUserMode;
+import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
+import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
+import org.wso2.carbon.automation.extensions.ExtensionConstants;
+import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
+
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * Test Automation server extension to start the DAS.
+ * This will set the carbon_home to {carbonHome}/core and port offset : 2
+ */
+public class AnalyticsServerExtension extends ExecutionListenerExtension {
+
+ private CustomTestServerManager serverManager;
+ private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
+ private String executionEnvironment;
+ private AutomationContext automationContext;
+
+
+ @Override
+ public void initiate() throws AutomationFrameworkException {
+ try {
+ automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
+ if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
+ getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "2");
+ }
+ serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
+ executionEnvironment =
+ automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
+
+ } catch (XPathExpressionException e) {
+ handleException("Error while initiating test environment", e);
+ }
+ }
+
+ @Override
+ public void onExecutionStart() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ String carbonHome = serverManager.startServer("analytics");
+ log.info(carbonHome);
+ System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
+ }
+ } catch (Exception e) {
+ handleException("Fail to start carbon server ", e);
+ }
+ }
+
+ @Override
+ public void onExecutionFinish() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ serverManager.stopServer();
+ }
+ } catch (Exception e) {
+ handleException("Fail to stop carbon server ", e);
+ }
+ }
+
+ private static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+}
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java
new file mode 100644
index 00000000..d9657b41
--- /dev/null
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.carbon.iot.integration.web.ui.test.extension;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
+import org.wso2.carbon.automation.engine.context.AutomationContext;
+import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
+import org.wso2.carbon.automation.engine.context.TestUserMode;
+import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
+import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
+import org.wso2.carbon.automation.extensions.ExtensionConstants;
+import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
+
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * Test Automation server extension to start the Broker.
+ * This will set the carbon_home to {carbonHome}/core and port offset : 3
+ */
+public class BrokerServerExtension extends ExecutionListenerExtension {
+
+ private CustomTestServerManager serverManager;
+ private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
+ private String executionEnvironment;
+ private AutomationContext automationContext;
+
+
+ @Override
+ public void initiate() throws AutomationFrameworkException {
+ try {
+ automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
+ if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
+ getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "3");
+ }
+ serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
+ executionEnvironment =
+ automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
+
+ } catch (XPathExpressionException e) {
+ handleException("Error while initiating test environment", e);
+ }
+ }
+
+ @Override
+ public void onExecutionStart() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ String carbonHome = serverManager.startServer("broker");
+ log.info(carbonHome);
+ System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
+ }
+ } catch (Exception e) {
+ handleException("Fail to start carbon server ", e);
+ }
+ }
+
+ @Override
+ public void onExecutionFinish() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ serverManager.stopServer();
+ }
+ } catch (Exception e) {
+ handleException("Fail to stop carbon server ", e);
+ }
+ }
+
+ private static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+}
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java
new file mode 100644
index 00000000..fa9c34d8
--- /dev/null
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java
@@ -0,0 +1,147 @@
+/*
+* Copyright (c) 2005-2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* WSO2 Inc. licenses this file to you under the Apache License,
+* Version 2.0 (the "License"); you may not use this file except
+* in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.wso2.carbon.iot.integration.web.ui.test.extension;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.automation.engine.FrameworkConstants;
+import org.wso2.carbon.automation.engine.context.AutomationContext;
+import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
+import org.wso2.carbon.automation.extensions.ExtensionConstants;
+import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerManager;
+
+import javax.xml.xpath.XPathExpressionException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CustomTestServerManager {
+ protected CarbonServerManager carbonServer;
+ protected String carbonZip;
+ protected int portOffset;
+ protected Map commandMap = new HashMap();
+ private static final Log log = LogFactory.getLog(CustomTestServerManager.class);
+ protected String carbonHome;
+
+ public CustomTestServerManager(AutomationContext context) {
+ carbonServer = new CarbonServerManager(context);
+ }
+
+ public CustomTestServerManager(AutomationContext context, String carbonZip) {
+ carbonServer = new CarbonServerManager(context);
+ this.carbonZip = carbonZip;
+ }
+
+ public CustomTestServerManager(AutomationContext context, int portOffset) {
+ carbonServer = new CarbonServerManager(context);
+ this.portOffset = portOffset;
+ commandMap.put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, String.valueOf(portOffset));
+ }
+
+ public CustomTestServerManager(AutomationContext context, String carbonZip,
+ Map commandMap) {
+ carbonServer = new CarbonServerManager(context);
+ this.carbonZip = carbonZip;
+ if (commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) != null) {
+ this.portOffset = Integer.parseInt(commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND));
+ } else {
+ throw new IllegalArgumentException("portOffset value must be set in command list");
+ }
+ this.commandMap = commandMap;
+ }
+
+ public String getCarbonZip() {
+ return carbonZip;
+ }
+
+ public String getCarbonHome() {
+ return carbonHome;
+ }
+
+ public int getPortOffset() {
+ return portOffset;
+ }
+
+ public void configureServer() throws AutomationFrameworkException {
+
+ }
+
+
+ public Map getCommands() {
+ return commandMap;
+ }
+
+ /**
+ * This method is called for starting a Carbon server in preparation for execution of a
+ * TestSuite
+ *
+ * Add the @BeforeSuite TestNG annotation in the method overriding this method
+ * @param server : The server which needs to be start.
+ * @return The CARBON_HOME
+ * @throws java.io.IOException If an error occurs while copying the deployment artifacts into the
+ * Carbon server
+ */
+ public String startServer(String server)
+ throws AutomationFrameworkException, IOException, XPathExpressionException {
+ if(carbonHome == null) {
+ if (carbonZip == null) {
+ carbonZip = System.getProperty(FrameworkConstants.SYSTEM_PROPERTY_CARBON_ZIP_LOCATION);
+ }
+ if (carbonZip == null) {
+ throw new IllegalArgumentException("carbon zip file cannot find in the given location");
+ }
+ carbonHome = carbonServer.setUpCarbonHome(carbonZip) + "/" + server;
+ configureServer();
+ }
+ log.info("Carbon Home - " + carbonHome );
+ if (commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) != null) {
+ this.portOffset = Integer.parseInt(commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND));
+ } else {
+ this.portOffset = 0;
+ }
+ carbonServer.startServerUsingCarbonHome(carbonHome, commandMap);
+ return carbonHome;
+ }
+
+ /**
+ * Restarting server already started by the method startServer
+ * @throws AutomationFrameworkException
+ */
+ public void restartGracefully() throws AutomationFrameworkException {
+ if(carbonHome == null) {
+ throw new AutomationFrameworkException("No Running Server found to restart. " +
+ "Please make sure whether server is started");
+ }
+ carbonServer.restartGracefully();
+ }
+
+ /**
+ * This method is called for stopping a Carbon server
+ *
+ * Add the @AfterSuite annotation in the method overriding this method
+ *
+ * @throws AutomationFrameworkException If an error occurs while shutting down the server
+ */
+ public void stopServer() throws AutomationFrameworkException {
+ carbonServer.serverShutdown(portOffset);
+ }
+
+
+
+
+}
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java
new file mode 100644
index 00000000..c7992a47
--- /dev/null
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.carbon.iot.integration.web.ui.test.extension;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
+import org.wso2.carbon.automation.engine.context.AutomationContext;
+import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
+import org.wso2.carbon.automation.engine.context.TestUserMode;
+import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
+import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
+import org.wso2.carbon.automation.extensions.ExtensionConstants;
+import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
+
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * Test Automation server extension to start the IOT core.
+ * This will set the carbon_home to {carbonHome}/core and port offset : 0
+ */
+public class IOTServerExtension extends ExecutionListenerExtension {
+
+ private CustomTestServerManager serverManager;
+ private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
+ private String executionEnvironment;
+ private AutomationContext automationContext;
+
+
+ @Override
+ public void initiate() throws AutomationFrameworkException {
+ try {
+ automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
+ if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
+ getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "0");
+ }
+ serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
+ executionEnvironment =
+ automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
+
+ } catch (XPathExpressionException e) {
+ handleException("Error while initiating test environment", e);
+ }
+ }
+
+ @Override
+ public void onExecutionStart() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ String carbonHome = serverManager.startServer("core");
+ log.info(carbonHome);
+ System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
+ }
+ } catch (Exception e) {
+ handleException("Fail to start carbon server ", e);
+ }
+ }
+
+ @Override
+ public void onExecutionFinish() throws AutomationFrameworkException {
+ try {
+ if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
+ serverManager.stopServer();
+ }
+ } catch (Exception e) {
+ handleException("Fail to stop carbon server ", e);
+ }
+ }
+
+ private static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+}
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
index 936e23ed..5cfb0229 100644
--- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
+++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
@@ -24,7 +24,7 @@
- 60000
+ 300000
@@ -172,7 +172,9 @@
9763
+ 9446
9443
+ 9445
@@ -187,7 +189,9 @@
- org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension
+ org.wso2.carbon.iot.integration.web.ui.test.extension.BrokerServerExtension
+ org.wso2.carbon.iot.integration.web.ui.test.extension.IOTServerExtension
+ org.wso2.carbon.iot.integration.web.ui.test.extension.AnalyticsServerExtension
org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension
diff --git a/modules/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml
index 459c0451..6c9618b8 100644
--- a/modules/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@@ -21,7 +21,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml
index be445685..2852c1b2 100644
--- a/modules/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/pom.xml
@@ -22,7 +22,7 @@
org.wso2.iot
wso2iot-integration
- 1.0.0-SNAPSHOT
+ 3.0.1-SNAPSHOT
../pom.xml