community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/tcdlpds/carbon-device-mgt-plugins

Browse Source
This commit is contained in:
lasanthaDLPDS 2019-12-10 17:58:58 +05:30
commit ff90a10042
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/main/java/org/wso2/carbon/device/mgt/mobile/android/core/util/AndroidDeviceUtils.java
View File

@ -705,7 +705,7 @@ public class AndroidDeviceUtils {
JsonElement googlePolicyPayload = appElement.getAsJsonObject().
get(AndroidConstants.ApplicationInstall.GOOGLE_POLICY_PAYLOAD);
if (googlePolicyPayload == null) {
if (googlePolicyPayload == null || googlePolicyPayload.toString().equals("\"\"")) {
uuid = appElement.getAsJsonObject().
get(AndroidConstants.ApplicationInstall.ENROLLMENT_APP_INSTALL_UUID).getAsString();
try (CloseableHttpClient httpClient = HttpClients.createDefault()) {

18
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/test/java/org/wso2/carbon/device/mgt/mobile/android/core/DeviceManagementServiceTests.java
View File

@ -196,9 +196,9 @@ public class DeviceManagementServiceTests {
mockDeviceManagementService();
mockPolicyManagerService();
mockUser();
Response response = androidService.enrollDevice(TestUtils.getBasicAndroidDevice());
Assert.assertNotNull(response);
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
Message message = androidService.enrollDevice(TestUtils.getBasicAndroidDevice());
Assert.assertNotNull(message);
Assert.assertEquals(message.getResponseCode(), Response.Status.OK.getStatusCode());
}
@Test
@ -237,9 +237,9 @@ public class DeviceManagementServiceTests {
properties.add(property);
androidDevice.setProperties(properties);
Response response = androidService.enrollDevice(androidDevice);
Assert.assertNotNull(response);
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
Message message = androidService.enrollDevice(androidDevice);
Assert.assertNotNull(message);
Assert.assertEquals(message.getResponseCode(), Response.Status.OK.getStatusCode());
}
@Test
@ -249,9 +249,9 @@ public class DeviceManagementServiceTests {
mockUser();
AndroidDevice androidDevice = TestUtils.getBasicAndroidDevice();
androidDevice.setDeviceIdentifier("1234");
Response response = androidService.enrollDevice(androidDevice);
Assert.assertNotNull(response);
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
Message message = androidService.enrollDevice(androidDevice);
Assert.assertNotNull(message);
Assert.assertEquals(message.getResponseCode(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
@Test