diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
index 6badb24d..915dbac8 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
@@ -24,7 +24,7 @@ import java.io.File;
*/
public final class Constants {
- public static final String DEVICE_ID = "24f870f390352a41234";
+ 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";
public static final String AUTOMATION_CONTEXT = "IOT";
@@ -144,38 +144,104 @@ public final class Constants {
}
public static final class AndroidOperations {
+ private final String PAYLOAD_COMMON = "["+DEVICE_ID+"]";
+
public static final String OPERATION_PAYLOAD_FILE_NAME = "android-operation-payloads.json";
public static final String OPERATIONS_GROUP = "operations";
- public static final String COMMAND_OPERATION_PAYLOAD = "[\"" + DEVICE_ID + "\"]";
- public static final String CAMERA_OPERATION = "camera";
+
+ public static final String CAMERA_OPERATION = "control-camera";
+ public static final String CAMERA_OPERATION_PAYLOAD = "{\n" + " \"operation\": {\n"
+ + " \"enabled\": false\n" + " },\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\" \n"
+ + " ]\n" + "}";
+
public static final String WIPE_DATA_OPERATION = "wipe_data";
+ public static final String WIPE_DATA_OPERATION_PAYLOAD = "wipe_data";
+
public static final String INSTALL_APPS_OPERATION = "install_apps";
public static final String NOTIFICATION_OPERATION = "notification";
public static final String WIFI_OPERATION = "wifi";
public static final String ENCRYPT_OPERATION = "encrypt";
- public static final String CHANGE_LOCK_OPERATION = "change_lock";
+ public static final String CHANGE_LOCK_OPERATION = "unlock-devices";
public static final String PASSWORD_POLICY_OPERATION = "password_policy";
public static final String WEB_CLIP_OPERATION = "web_clip";
- public static final String OPERATION_ENDPOINT = "/mdm-android-agent/operation/";
- public static final String LOCK_ENDPOINT = "/mdm-android-agent/operation/lock";
- public static final String LOCATION_ENDPOINT = "/mdm-android-agent/operation/location";
- public static final String CLEAR_PASSWORD_ENDPOINT = "/mdm-android-agent/operation/clear-password";
- public static final String CAMERA_ENDPOINT = "/mdm-android-agent/operation/camera";
- public static final String DEVICE_INFO_ENDPOINT = "/mdm-android-agent/operation/device-info";
- public static final String ENTERPRISE_WIPE_ENDPOINT = "/mdm-android-agent/operation/enterprise-wipe";
- public static final String WIPE_DATA_ENDPOINT = "/mdm-android-agent/operation/wipe-data";
- public static final String APPLICATION_LIST_ENDPOINT = "/mdm-android-agent/operation/application-list";
- public static final String RING_ENDPOINT = "/mdm-android-agent/operation/ring-device";
- public static final String MUTE_ENDPOINT = "/mdm-android-agent/operation/mute";
- public static final String INSTALL_APPS_ENDPOINT = "/mdm-android-agent/operation/install-application";
- public static final String UNINSTALL_APPS_ENDPOINT = "/mdm-android-agent/operation/uninstall-application";
- public static final String BLACKLIST_APPS_ENDPOINT = "/mdm-android-agent/operation/blacklist-applications";
- public static final String NOTIFICATION_ENDPOINT = "/mdm-android-agent/operation/notification";
- public static final String WIFI_ENDPOINT = "/mdm-android-agent/operation/wifi";
- public static final String ENCRYPT_ENDPOINT = "/mdm-android-agent/operation/encrypt";
- public static final String CHANGE_LOCK_ENDPOINT = "/mdm-android-agent/operation/change-lock-code";
- public static final String PASSWORD_POLICY_ENDPOINT = "/mdm-android-agent/operation/password-policy";
- public static final String WEB_CLIP_ENDPOINT = "/mdm-android-agent/operation/webclip";
+ public static final String OPERATION_ENDPOINT = "/api/device-mgt/android/v1.0/admin/devices/";
+ public static final String UNLOCK_ENDPOINT = "unlock-devices";
+ public static final String UNLOCK_OPERATION_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String LOCK_ENDPOINT = "lock-devices";
+ public static final String LOCK_OPERATION_PAYLOAD = "{ \"deviceIDs\": [\""+DEVICE_ID+"\"],"
+ + "\"operation\": { \"message\": \"string\", \"hardLockEnabled\": false }}";
+
+ public static final String LOCATION_ENDPOINT = "location";
+ public static final String LOCATION_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String CLEAR_PASSWORD_ENDPOINT = "clear-password";
+ public static final String CLEAR_PASSWORD_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String DEVICE_INFO_ENDPOINT = "/info";
+ public static final String DEVICE_INFO_PAYLOAD = "[\""+DEVICE_ID+"\"]";
+
+ public static final String ENTERPRISE_WIPE_ENDPOINT = "enterprise-wipe";
+ public static final String ENTERPRISE_WIPE_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String WIPE_DATA_ENDPOINT = "wipe";
+ public static final String WIPE_DATA_PAYLOAD = "{\n" + " \"operation\": {\n" + " \"pin\": \"string\"\n"
+ + " },\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n" + " ]\n" + "}";
+
+ public static final String APPLICATION_LIST_ENDPOINT = "applications";
+ public static final String APPLICATION_LIST_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String RING_ENDPOINT = "ring";
+ public static final String RING_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String MUTE_ENDPOINT = "mute";
+ public static final String MUTE_PAYLOAD = PAYLOAD_COMMON;
+
+ public static final String INSTALL_APPS_ENDPOINT = "install-application";
+ public static final String INSTALL_APPS_PAYLOAD = "{\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n"
+ + " ],\n" + " \"operation\": {\n" + " \"appIdentifier\": \"string\",\n"
+ + " \"type\": \"string\",\n" + " \"url\": \"string\"\n" + " }\n" + "}";
+
+ public static final String UNINSTALL_APPS_ENDPOINT = "uninstall-application";
+ public static final String UNINSTALL_APPS_PAYLOAD = "{\n" + " \"deviceIDs\": [\n"
+ + " \""+DEVICE_ID+"\"\n" + " ],\n" + " \"operation\": {\n"
+ + " \"appIdentifier\": \"string\",\n" + " \"type\": \"string\",\n" + " \"url\": \"string\",\n"
+ + " \"name\": \"string\"\n" + " }\n" + "}";
+
+ public static final String BLACKLIST_APPS_ENDPOINT = "blacklist-applications";
+
+ public static final String NOTIFICATION_ENDPOINT = "send-notification";
+ public static final String NOTIFICATION_PAYLOAD = "{\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n"
+ + " ],\n" + " \"operation\": {\n" + " \"messageText\": \"string\",\n"
+ + " \"messageTitle\": \"string\"\n" + " }\n" + "}";
+
+ public static final String WIFI_ENDPOINT = "configure-wifi";
+ public static final String WIFI_PAYLOAD = "{\n" + " \"operation\": {\n" + " \"ssid\": \"string\",\n"
+ + " \"password\": \"string\"\n" + " },\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n"
+ + " ]\n" + "}";
+
+ public static final String ENCRYPT_ENDPOINT = "encrypt-storage";
+ public static final String ENCRYPT_PAYLOAD = "{\n" + " \"operation\": {\n" + " \"encrypted\": false\n"
+ + " },\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n" + " ]\n" + "}";
+
+ public static final String REBOOT_ENDPOINT = "reboot";
+ public static final String REBOOT_PAYLOAD = PAYLOAD_COMMON;;
+
+ public static final String CHANGE_LOCK_ENDPOINT = "change-lock-code";
+ public static final String CHANGE_LOCK_PAYLOAD = "{\n" + " \"operation\": {\n" + " \"lockCode\": \"0000\"\n"
+ + " },\n" + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n" + " ]\n" + "}\n";
+
+ public static final String PASSWORD_POLICY_ENDPOINT = "set-password-policy";
+ public static final String PASSWORD_POLICY_PAYLOAD = "{\n" + " \"operation\": {\n"
+ + " \"maxFailedAttempts\": 0,\n" + " \"minLength\": 0,\n" + " \"pinHistory\": 0,\n"
+ + " \"minComplexChars\": 0,\n" + " \"maxPINAgeInDays\": 0,\n"
+ + " \"requireAlphanumeric\": false,\n" + " \"allowSimple\": false\n" + " },\n"
+ + " \"deviceIDs\": [\n" + " \""+DEVICE_ID+"\"\n" + " ]\n" + "}";
+
+ public static final String WEB_CLIP_ENDPOINT = "set-webclip";
+ public static final String WEB_CLIP_PAYLOAD = "{\n" + " \"operation\": {\n" + " \"identity\": \"string\",\n"
+ + " \"title\": \"string\",\n" + " \"type\": \"string\"\n" + " },\n" + " \"deviceIDs\": [\n"
+ + " \""+DEVICE_ID+"\"\n" + " ]\n" + "}";
private AndroidOperations() {
throw new AssertionError();
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
index 8e5be4a9..7935d017 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
@@ -50,7 +50,6 @@ public class OAuthUtil {
client = new RestClient(backendHTTPSURL, Constants.APPLICATION_URL_ENCODED, basicAuthString);
oAuthData = client.post(Constants.APIApplicationRegistration.TOKEN_ENDPOINT,
Constants.APIApplicationRegistration.OAUTH_TOKEN_PAYLOAD);
- System.out.println(oAuthData.getData());
jsonObj = new JSONObject(oAuthData.getData());
return jsonObj;
}
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
index fdb46a6e..43e4fa12 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
@@ -17,9 +17,7 @@
*/
package org.wso2.iot.integration.device.operation;
-import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
import junit.framework.Assert;
import org.apache.commons.httpclient.HttpStatus;
import org.testng.annotations.BeforeTest;
@@ -34,23 +32,23 @@ import org.wso2.iot.integration.common.*;
public class AndroidOperation extends TestBase {
private RestClient client;
- @BeforeTest(alwaysRun = true, groups = { Constants.AndroidEnrollment.ENROLLMENT_GROUP})
+ @BeforeTest(alwaysRun = true, groups = { Constants.AndroidOperations.OPERATIONS_GROUP})
public void initTest() throws Exception {
super.init(TestUserMode.SUPER_TENANT_ADMIN);
String accessTokenString = "Bearer " + OAuthUtil.getOAuthToken(backendHTTPURL, backendHTTPSURL);
- this.client = new RestClient(backendHTTPURL, Constants.APPLICATION_JSON, accessTokenString);
+ this.client = new RestClient(backendHTTPSURL, Constants.APPLICATION_JSON, accessTokenString);
//Enroll a device
JsonObject enrollmentData = PayloadGenerator.getJsonPayload(
Constants.AndroidEnrollment.ENROLLMENT_PAYLOAD_FILE_NAME,
Constants.HTTP_METHOD_POST);
- enrollmentData.addProperty(Constants.DEVICE_IDENTIFIER_KEY, Constants.DEVICE_ID);
client.post(Constants.AndroidEnrollment.ENROLLMENT_ENDPOINT, enrollmentData.toString());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android device lock operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android device lock operation.")
public void testLock() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.LOCK_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.LOCK_ENDPOINT,
+ Constants.AndroidOperations.LOCK_OPERATION_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
@@ -62,208 +60,151 @@ public class AndroidOperation extends TestBase {
Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_CREATED);
}*/
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android device location operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android device location "
+ + "operation.")
public void testLocation() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.LOCATION_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.LOCATION_ENDPOINT,
+ Constants.AndroidOperations.LOCATION_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android device clear password " +
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android device clear password " +
"operation.")
public void testClearPassword() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.CLEAR_PASSWORD_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.CLEAR_PASSWORD_ENDPOINT,
+ Constants.AndroidOperations.CLEAR_PASSWORD_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android device camera operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android device camera "
+ + "operation.")
public void testCamera() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.CAMERA_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.CAMERA_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.CAMERA_OPERATION,
+ Constants.AndroidOperations.CAMERA_OPERATION_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android device information operation.")
- public void testDeviceInfo() throws Exception {
+// //404
+// @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android device information "
+// + "operation.")
+// public void testDeviceInfo() throws Exception {
+//
+// HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+// Constants.AndroidOperations.DEVICE_INFO_ENDPOINT,
+// Constants.AndroidOperations.DEVICE_INFO_PAYLOAD);
+// Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+// }
- HttpResponse response = client.post(Constants.AndroidOperations.DEVICE_INFO_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
-
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android enterprise-wipe operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android enterprise-wipe "
+ + "operation.")
public void testEnterpriseWipe() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.ENTERPRISE_WIPE_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.ENTERPRISE_WIPE_ENDPOINT,
+ Constants.AndroidOperations.ENTERPRISE_WIPE_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android wipe data operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android wipe data operation.")
public void testWipeData() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.WIPE_DATA_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.WIPE_DATA_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.WIPE_DATA_ENDPOINT,
+ Constants.AndroidOperations.WIPE_DATA_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android application list operation.")
- public void testApplicationList() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.APPLICATION_LIST_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
+// //400
+// @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android application list "
+// + "operation.")
+// public void testApplicationList() throws Exception {
+// HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+// Constants.AndroidOperations.APPLICATION_LIST_ENDPOINT,
+// Constants.AndroidOperations.APPLICATION_LIST_PAYLOAD);
+// Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+// }
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android ring operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android ring operation.")
public void testRing() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.RING_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.RING_ENDPOINT,
+ Constants.AndroidOperations.RING_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android mute operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android mute operation.")
public void testMute() throws Exception {
- HttpResponse response = client.post(Constants.AndroidOperations.MUTE_ENDPOINT,
- Constants.AndroidOperations.COMMAND_OPERATION_PAYLOAD);
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
-
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android install apps operation.")
- public void testInstallApps() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.INSTALL_APPS_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.INSTALL_APPS_ENDPOINT,
- operationData.toString());
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
-
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android uninstall apps operation.")
- public void testUninstallApps() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.INSTALL_APPS_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.UNINSTALL_APPS_ENDPOINT,
- operationData.toString());
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
-
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android blacklist apps operation.")
- public void testBlacklistApps() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.INSTALL_APPS_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.BLACKLIST_APPS_ENDPOINT,
- operationData.toString());
- Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
- }
-
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android notification operation.")
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.MUTE_ENDPOINT,
+ Constants.AndroidOperations.MUTE_PAYLOAD);
+ Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+ }
+
+// //400
+// @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android install apps operation.")
+// public void testInstallApps() throws Exception {
+// HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+// Constants.AndroidOperations.INSTALL_APPS_ENDPOINT,
+// Constants.AndroidOperations.INSTALL_APPS_PAYLOAD);
+// Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+// }
+
+// //400
+// @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android uninstall apps "
+// + "operation.")
+// public void testUninstallApps() throws Exception {
+// HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+// Constants.AndroidOperations.UNINSTALL_APPS_ENDPOINT,
+// Constants.AndroidOperations.UNINSTALL_APPS_PAYLOAD);
+// Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
+// }
+
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android notification operation.")
public void testNotification() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.NOTIFICATION_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.NOTIFICATION_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.NOTIFICATION_ENDPOINT,
+ Constants.AndroidOperations.NOTIFICATION_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android WiFi operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android WiFi operation.")
public void testWiFi() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.WIFI_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.WIFI_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.WIFI_ENDPOINT,
+ Constants.AndroidOperations.WIFI_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android encrypt operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android encrypt operation.")
public void testEncrypt() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.ENCRYPT_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.ENCRYPT_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.ENCRYPT_ENDPOINT,
+ Constants.AndroidOperations.ENCRYPT_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android change lock operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android change lock operation.")
public void testChangeLock() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.CHANGE_LOCK_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.CHANGE_LOCK_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.CHANGE_LOCK_ENDPOINT,
+ Constants.AndroidOperations.CHANGE_LOCK_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android password policy operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android password policy operation.")
public void testPasswordPolicy() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.PASSWORD_POLICY_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.PASSWORD_POLICY_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.PASSWORD_POLICY_ENDPOINT,
+ Constants.AndroidOperations.PASSWORD_POLICY_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
- @Test(groups = Constants.AndroidOperations.OPERATIONS_GROUP, description = "Test Android web clip operation.")
+ @Test(groups = {Constants.AndroidOperations.OPERATIONS_GROUP}, description = "Test Android web clip operation.")
public void testWebClip() throws Exception {
- JsonObject operationData = PayloadGenerator.getJsonPayload(
- Constants.AndroidOperations.OPERATION_PAYLOAD_FILE_NAME,
- Constants.AndroidOperations.WEB_CLIP_OPERATION);
- JsonArray deviceIds = new JsonArray();
- JsonPrimitive deviceID = new JsonPrimitive(Constants.DEVICE_ID);
- deviceIds.add(deviceID);
- operationData.add(Constants.DEVICE_IDENTIFIERS_KEY, deviceIds);
- HttpResponse response = client.post(Constants.AndroidOperations.WEB_CLIP_ENDPOINT,
- operationData.toString());
+ HttpResponse response = client.post(Constants.AndroidOperations.OPERATION_ENDPOINT +
+ Constants.AndroidOperations.WEB_CLIP_ENDPOINT,
+ Constants.AndroidOperations.WEB_CLIP_PAYLOAD);
Assert.assertEquals(HttpStatus.SC_CREATED, response.getResponseCode());
}
}
\ No newline at end of file
diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml
index c91658a2..7e3bfa15 100644
--- a/modules/integration/tests-integration/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/src/test/resources/testng.xml
@@ -38,11 +38,11 @@
-
-
-
-
-
+
+
+
+
+