From 1178869ef38daaba3f975a1b5a759759acb27730 Mon Sep 17 00:00:00 2001 From: megala21 Date: Tue, 16 May 2017 20:20:55 +0530 Subject: [PATCH] Updating versions --- .../iot/integration/common/Constants.java | 57 +++++++++++++++---- .../extensions/AnalyticsServerExtension.java | 2 - .../samples/MobileQSGTestCase.java | 15 ++++- .../src/test/resources/testng.xml | 5 ++ pom.xml | 6 +- 5 files changed, 66 insertions(+), 19 deletions(-) diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java index c2cee1a6..056db2eb 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java @@ -23,7 +23,6 @@ import java.io.File; * Constants used through out the test suite are defined here. */ public final class Constants { - public static final String DEVICE_ID = "d24f870f390352a41234"; public static final String NUMBER_NOT_EQUAL_TO_DEVICE_ID = "1111"; public static final String DEVICE_IMEI = "123123123"; @@ -44,9 +43,7 @@ public final class Constants { public static final String CONTENT_TYPE = "Content-Type"; public static final String APPLICATION_SOAP_XML = "application/soap+xml; charset=utf-8"; public static final String UTF8 = "UTF-8"; - public static final String ZERO = "0"; - public static final String NULL = "[]"; - public static final String INACTIVE = "INACTIVE"; + public static final int HTTPS_ANALYTICS_PORT = 9445; public static final String HTTPS = "https"; public static final String HTTP = "http"; @@ -67,7 +64,32 @@ public final class Constants { + "perm:android:upgrade-firmware perm:android:set-webclip perm:android:send-notification " + "perm:android:disenroll perm:android:update-application perm:android:unlock-devices " + "perm:android:control-camera perm:android:reboot perm:android:logcat appm:read appm:subscribe " - + "perm:sign-csr perm:admin:devices:view perm:roles:add perm:roles:add-users perm:roles:update perm:roles:permissions perm:roles:details perm:roles:view perm:roles:create-combined-role perm:roles:delete perm:dashboard:vulnerabilities perm:dashboard:non-compliant-count perm:dashboard:non-compliant perm:dashboard:by-groups perm:dashboard:device-counts perm:dashboard:feature-non-compliant perm:dashboard:count-overview perm:dashboard:filtered-count perm:dashboard:details perm:get-activity perm:devices:delete perm:devices:applications perm:devices:effective-policy perm:devices:compliance-data perm:devices:features perm:devices:operations perm:devices:search perm:devices:details perm:devices:update perm:devices:view perm:view-configuration perm:manage-configuration perm:policies:remove perm:policies:priorities perm:policies:deactivate perm:policies:get-policy-details perm:policies:manage perm:policies:activate perm:policies:update perm:policies:changes perm:policies:get-details perm:users:add perm:users:details perm:users:count perm:users:delete perm:users:roles perm:users:user-details perm:users:credentials perm:users:search perm:users:is-exist perm:users:update perm:users:send-invitation perm:admin-users:view perm:groups:devices perm:groups:update perm:groups:add perm:groups:device perm:groups:devices-count perm:groups:remove perm:groups:groups perm:groups:groups-view perm:groups:share perm:groups:count perm:groups:roles perm:groups:devices-remove perm:groups:devices-add perm:groups:assign perm:device-types:features perm:device-types:types perm:applications:install perm:applications:uninstall perm:admin-groups:count perm:admin-groups:view perm:notifications:mark-checked perm:notifications:view perm:admin:certificates:delete perm:admin:certificates:details perm:admin:certificates:view perm:admin:certificates:add perm:admin:certificates:verify perm:ios:enroll perm:ios:view-device perm:ios:apn perm:ios:ldap perm:ios:enterprise-app perm:ios:store-application perm:ios:remove-application perm:ios:app-list perm:ios:profile-list perm:ios:lock perm:ios:enterprise-wipe perm:ios:device-info perm:ios:restriction perm:ios:email perm:ios:cellular perm:ios:applications perm:ios:wifi perm:ios:ring perm:ios:location perm:ios:notification perm:ios:airplay perm:ios:caldav perm:ios:cal-subscription perm:ios:passcode-policy perm:ios:webclip perm:ios:vpn perm:ios:per-app-vpn perm:ios:app-to-per-app-vpn perm:ios:app-lock perm:ios:clear-passcode perm:ios:remove-profile perm:ios:get-restrictions perm:ios:wipe-data perm:admin perm:android:applications"; + + "perm:sign-csr perm:admin:devices:view perm:roles:add perm:roles:add-users perm:roles:update " + + "perm:roles:permissions perm:roles:details perm:roles:view perm:roles:create-combined-role perm:roles:delete " + + "perm:dashboard:vulnerabilities perm:dashboard:non-compliant-count perm:dashboard:non-compliant " + + "perm:dashboard:by-groups perm:dashboard:device-counts perm:dashboard:feature-non-compliant " + + "perm:dashboard:count-overview perm:dashboard:filtered-count perm:dashboard:details perm:get-activity " + + "perm:devices:delete perm:devices:applications perm:devices:effective-policy perm:devices:compliance-data " + + "perm:devices:features perm:devices:operations perm:devices:search perm:devices:details perm:devices:update " + + "perm:devices:view perm:view-configuration perm:manage-configuration perm:policies:remove " + + "perm:policies:priorities perm:policies:deactivate perm:policies:get-policy-details perm:policies:manage " + + "perm:policies:activate perm:policies:update perm:policies:changes perm:policies:get-details " + + "perm:users:add perm:users:details perm:users:count perm:users:delete perm:users:roles perm:users:user-details " + + "perm:users:credentials perm:users:search perm:users:is-exist perm:users:update perm:users:send-invitation " + + "perm:admin-users:view perm:groups:devices perm:groups:update perm:groups:add perm:groups:device " + + "perm:groups:devices-count perm:groups:remove perm:groups:groups perm:groups:groups-view perm:groups:share " + + "perm:groups:count perm:groups:roles perm:groups:devices-remove perm:groups:devices-add perm:groups:assign " + + "perm:device-types:features perm:device-types:types perm:applications:install perm:applications:uninstall " + + "perm:admin-groups:count perm:admin-groups:view perm:notifications:mark-checked perm:notifications:view " + + "perm:admin:certificates:delete perm:admin:certificates:details perm:admin:certificates:view " + + "perm:admin:certificates:add perm:admin:certificates:verify perm:ios:enroll perm:ios:view-device " + + "perm:ios:apn perm:ios:ldap perm:ios:enterprise-app perm:ios:store-application perm:ios:remove-application " + + "perm:ios:app-list perm:ios:profile-list perm:ios:lock perm:ios:enterprise-wipe perm:ios:device-info " + + "perm:ios:restriction perm:ios:email perm:ios:cellular perm:ios:applications perm:ios:wifi perm:ios:ring " + + "perm:ios:location perm:ios:notification perm:ios:airplay perm:ios:caldav perm:ios:cal-subscription " + + "perm:ios:passcode-policy perm:ios:webclip perm:ios:vpn perm:ios:per-app-vpn perm:ios:app-to-per-app-vpn " + + "perm:ios:app-lock perm:ios:clear-passcode perm:ios:remove-profile perm:ios:get-restrictions " + + "perm:ios:wipe-data perm:admin perm:android:applications perm:devicetype:deployment perm:android-sense:enroll"; public static final String OAUTH_TOKEN_PAYLOAD = "username=admin&password=admin" + MULTI_TENANT_OAUTH_TOKEN_PAYLOAD; @@ -79,9 +101,10 @@ public final class Constants { public static final String PERMISSION_LIST = "appm:read appm:subscribe perm:admin-groups:count " + "perm:admin-groups:view perm:admin-users:view perm:admin:certificates:add perm:admin:certificates:delete " + "perm:admin:certificates:details perm:admin:certificates:verify perm:admin:certificates:view " - + "perm:admin:devices:view perm:android:applications perm:android:blacklist-applications " - + "perm:android:change-lock-code perm:android:clear-password perm:android:configure-vpn perm:android:configure-wifi " - + "perm:android:control-camera perm:android:disenroll perm:android:encrypt-storage " + + "perm:admin:devices:view perm:android-sense:enroll perm:android:applications " + + "perm:android:blacklist-applications perm:android:change-lock-code perm:android:clear-password " + + "perm:android:configure-vpn perm:android:configure-wifi perm:android:control-camera " + + "perm:android:disenroll perm:android:encrypt-storage " + "perm:android:enroll perm:android:enterprise-wipe perm:android:info perm:android:install-application " + "perm:android:location perm:android:lock-devices perm:android:logcat perm:android:manage-configuration " + "perm:android:mute perm:android:reboot perm:android:ring perm:android:send-notification " @@ -91,8 +114,8 @@ public final class Constants { + "perm:device-types:features perm:device-types:types perm:devices:applications " + "perm:devices:compliance-data perm:devices:delete perm:devices:details perm:devices:effective-policy " + "perm:devices:features perm:devices:operations perm:devices:search perm:devices:update " - + "perm:devices:view perm:get-activity perm:groups:add perm:groups:assign perm:groups:count " - + "perm:groups:device perm:groups:devices perm:groups:devices-add perm:groups:devices-count " + + "perm:devices:view perm:devicetype:deployment perm:get-activity perm:groups:add perm:groups:assign " + + "perm:groups:count perm:groups:device perm:groups:devices perm:groups:devices-add perm:groups:devices-count " + "perm:groups:devices-remove perm:groups:groups perm:groups:groups-view perm:groups:remove " + "perm:groups:roles perm:groups:share perm:groups:update perm:manage-configuration " + "perm:notifications:mark-checked perm:notifications:view perm:policies:activate " @@ -306,8 +329,6 @@ public final class Constants { public static final String REQUEST_PAYLOAD_FILE_NAME = "mobile-device-mgt-payloads.json"; public static final String UPDATE_PAYLOAD_OPERATION = "UPDATE_DEVICE_INFO"; public static final String VIEW_DEVICE_TYPES_ENDPOINT = "/mdm-admin/devices/types"; - public static final String VIEW_DEVICE_RESPONSE_PAYLOAD_FILE_NAME = - "mobile-device-mgt-view-device-types-response-payloads.json"; public static final String NO_DEVICE = "{\"devices\":[],\"count\":0}"; private MobileDeviceManagement() { @@ -399,7 +420,19 @@ public final class Constants { private NotificationManagement() { throw new AssertionError(); } + } + public static final class AndroidSenseEnrollment { + public static final String ENROLLMENT_ENDPOINT = "/android_sense/1.0.0/device/"; + public static final String RETRIEVER_ENDPOINT = "analytics/tables/"; + public static final String ANALYTICS_ARTIFACTS_DEPLOYMENT_ENDPOINT = "/api/device-mgt/v1.0/admin/devicetype/1.0.0/deploy/android_sense"; + public static final String ENROLLMENT_PAYLOAD_FILE_NAME = "android-sense-enrollment-payloads.json"; + public static final String PUBLISH_DATA_OPERATION = "PUBLISH_DATA"; + public static final String BATTERY_STATS_TABLE_NAME = "ORG_WSO2_IOT_ANDROID_BATTERY_STATS"; + public static final String IS_TABLE_EXIST_CHECK_URL = "analytics/table_exists"; + private AndroidSenseEnrollment() { + throw new AssertionError(); + } } public static final class QSGManagement { diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java index 23e932c0..3f9693a0 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java @@ -63,8 +63,6 @@ public class AnalyticsServerExtension extends ExecutionListenerExtension { 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); diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java index a6d2e815..085abc9e 100644 --- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java +++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java @@ -20,6 +20,7 @@ package org.wso2.iot.integration.samples; import junit.framework.Assert; import org.apache.commons.httpclient.HttpStatus; +import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.wso2.carbon.automation.engine.context.TestUserMode; @@ -37,12 +38,16 @@ import java.io.IOException; */ public class MobileQSGTestCase extends TestBase { private RestClient client; + private String username1; + private String username2; @BeforeClass(alwaysRun = true, groups = { Constants.UserManagement.USER_MANAGEMENT_GROUP}) public void initTest() throws Exception { super.init(TestUserMode.SUPER_TENANT_ADMIN); backendHTTPSURL = automationContext.getContextUrls().getWebAppURLHttps(); this.client = new RestClient(backendHTTPSURL, Constants.APPLICATION_JSON, accessTokenString); + username1 = "alex"; + username2 = "chris"; } @Test(description = "This test case tests the execution of QSG script, whether it executes without any exceptions") @@ -61,11 +66,9 @@ public class MobileQSGTestCase extends TestBase { public void testUserRoleCreation() throws Exception { // Two users will be created with the quick start script, check whether those two users are created // successfully, - String username1 = "alex"; String url = Constants.UserManagement.USER_ENDPOINT + "/" + username1; HttpResponse response = client.get(url); Assert.assertEquals(HttpStatus.SC_OK, response.getResponseCode()); - String username2 = "chris"; url = Constants.UserManagement.USER_ENDPOINT + "/" + username2; response = client.get(url); Assert.assertEquals(HttpStatus.SC_OK, response.getResponseCode()); @@ -99,4 +102,12 @@ public class MobileQSGTestCase extends TestBase { Assert.assertTrue("Windows pass-code policy is not added from qsg script", response.getData().contains("windows-passcode-policy1")); } + + @AfterClass(alwaysRun = true) + public void tearDown() throws Exception { + String url = Constants.UserManagement.USER_ENDPOINT + "/" + username1; + client.delete(url); + url = Constants.UserManagement.USER_ENDPOINT + "/" + username2; + client.delete(url); + } } diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml index 1c58a477..cb203e09 100644 --- a/modules/integration/tests-integration/src/test/resources/testng.xml +++ b/modules/integration/tests-integration/src/test/resources/testng.xml @@ -94,6 +94,11 @@ + + + + + diff --git a/pom.xml b/pom.xml index 5d2cbd21..80357631 100644 --- a/pom.xml +++ b/pom.xml @@ -1513,7 +1513,7 @@ - 2.0.64 + 2.0.65 [2.0.0, 3.0.0) @@ -1521,7 +1521,7 @@ - 3.0.34 + 3.0.35 6.1.80 @@ -1631,7 +1631,7 @@ 1.2.25 - 1.4.4 + 1.4.8 5.1.4