mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Adding test cases for UserManagementServicee
This commit is contained in:
megala21
parent
f724ff341f
commit
68533808c5
@ -22,21 +22,13 @@ import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
|
||||
import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
|
||||
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
|
||||
import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
|
||||
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
|
||||
import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoWrapper;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.EnrollmentInvitation;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.OldPasswordResetWrapper;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.UserInfo;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.*;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.service.api.UserManagementService;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
|
||||
@ -50,16 +42,7 @@ import org.wso2.carbon.user.api.UserStoreException;
|
||||
import org.wso2.carbon.user.api.UserStoreManager;
|
||||
import org.wso2.carbon.utils.CarbonUtils;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.DELETE;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.HeaderParam;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.PUT;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.io.File;
|
||||
@ -67,14 +50,7 @@ import java.io.UnsupportedEncodingException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
@Path("/users")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ -86,7 +62,6 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
private static final Log log = LogFactory.getLog(UserManagementServiceImpl.class);
|
||||
|
||||
private static final String DEFAULT_DEVICE_USER = "Internal/devicemgt-user";
|
||||
private static final String DEFAULT_DEVICE_ADMIN = "Internal/devicemgt-admin";
|
||||
|
||||
// Permissions that are given for a normal device user.
|
||||
private static final Permission[] PERMISSIONS_FOR_DEVICE_USER = {
|
||||
@ -253,7 +228,11 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
log.debug("User credential of username: " + username + " has been changed");
|
||||
}
|
||||
List<String> currentRoles = this.getFilteredRoles(userStoreManager, username);
|
||||
List<String> newRoles = Arrays.asList(userInfo.getRoles());
|
||||
|
||||
List<String> newRoles = new ArrayList<>();
|
||||
if (userInfo.getRoles() != null) {
|
||||
newRoles = Arrays.asList(userInfo.getRoles());
|
||||
}
|
||||
|
||||
List<String> rolesToAdd = new ArrayList<>(newRoles);
|
||||
List<String> rolesToDelete = new ArrayList<>();
|
||||
@ -288,7 +267,7 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
|
||||
private List<String> getFilteredRoles(UserStoreManager userStoreManager, String username)
|
||||
throws UserStoreException {
|
||||
String[] roleListOfUser = new String[0];
|
||||
String[] roleListOfUser;
|
||||
roleListOfUser = userStoreManager.getRoleListOfUser(username);
|
||||
List<String> filteredRoles = new ArrayList<>();
|
||||
for (String role : roleListOfUser) {
|
||||
@ -429,8 +408,8 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
public Response getUserCount() {
|
||||
try {
|
||||
UserStoreCountRetriever userStoreCountRetrieverService = DeviceMgtAPIUtils.getUserStoreCountRetrieverService();
|
||||
RealmConfiguration secondaryRealmConfiguration = CarbonContext.getThreadLocalCarbonContext().getUserRealm().
|
||||
getRealmConfiguration().getSecondaryRealmConfig();
|
||||
RealmConfiguration secondaryRealmConfiguration = DeviceMgtAPIUtils.getUserRealm().getRealmConfiguration()
|
||||
.getSecondaryRealmConfig();
|
||||
|
||||
if (secondaryRealmConfiguration != null) {
|
||||
if (!secondaryRealmConfiguration.isPrimary() && !Constants.JDBC_USERSTOREMANAGER.
|
||||
@ -488,12 +467,10 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
public Response isUserExists(@QueryParam("username") String userName) {
|
||||
try {
|
||||
UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
|
||||
boolean userExists = false;
|
||||
if (userStoreManager.isExistingUser(userName)) {
|
||||
userExists = true;
|
||||
return Response.status(Response.Status.OK).entity(userExists).build();
|
||||
return Response.status(Response.Status.OK).entity(true).build();
|
||||
} else {
|
||||
return Response.status(Response.Status.OK).entity(userExists).build();
|
||||
return Response.status(Response.Status.OK).entity(false).build();
|
||||
}
|
||||
} catch (UserStoreException e) {
|
||||
String msg = "Error while retrieving the user.";
|
||||
@ -605,9 +582,7 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService();
|
||||
try {
|
||||
Set<String> recipients = new HashSet<>();
|
||||
for (String recipient : enrollmentInvitation.getRecipients()) {
|
||||
recipients.add(recipient);
|
||||
}
|
||||
recipients.addAll(enrollmentInvitation.getRecipients());
|
||||
Properties props = new Properties();
|
||||
String username = DeviceMgtAPIUtils.getAuthenticatedUser();
|
||||
String firstName = getClaimValue(username, Constants.USER_CLAIM_FIRST_NAME);
|
||||
@ -621,6 +596,8 @@ public class UserManagementServiceImpl implements UserManagementService {
|
||||
} catch (DeviceManagementException e) {
|
||||
String msg = "Error occurred while inviting user to enrol their device";
|
||||
log.error(msg, e);
|
||||
return Response.serverError().entity(
|
||||
new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
|
||||
} catch (UserStoreException e) {
|
||||
String msg = "Error occurred while getting claim values to invite user";
|
||||
log.error(msg, e);
|
||||
|
||||
@ -0,0 +1,362 @@
|
||||
package org.wso2.carbon.device.mgt.jaxrs.service.impl;
|
||||
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.invocation.InvocationOnMock;
|
||||
import org.mockito.stubbing.Answer;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
|
||||
import org.testng.Assert;
|
||||
import org.testng.IObjectFactory;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.ObjectFactory;
|
||||
import org.testng.annotations.Test;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
|
||||
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
|
||||
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
|
||||
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.EnrollmentInvitation;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.beans.UserInfo;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.service.api.UserManagementService;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
|
||||
import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
|
||||
import org.wso2.carbon.user.api.RealmConfiguration;
|
||||
import org.wso2.carbon.user.api.UserRealm;
|
||||
import org.wso2.carbon.user.api.UserStoreException;
|
||||
import org.wso2.carbon.user.api.UserStoreManager;
|
||||
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
|
||||
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.mockito.MockitoAnnotations.initMocks;
|
||||
|
||||
@PowerMockIgnore("javax.ws.rs.*")
|
||||
@SuppressStaticInitializationFor({"org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils",
|
||||
"org.wso2.carbon.context.CarbonContext"})
|
||||
@PrepareForTest({DeviceMgtAPIUtils.class, MultitenantUtils.class, CarbonContext.class})
|
||||
public class UserManagementServiceImplTest {
|
||||
private UserStoreManager userStoreManager;
|
||||
private UserManagementService userManagementService;
|
||||
private DeviceManagementProviderService deviceManagementProviderService;
|
||||
private static final String DEFAULT_DEVICE_USER = "Internal/devicemgt-user";
|
||||
private UserRealm userRealm;
|
||||
private EnrollmentInvitation enrollmentInvitation;
|
||||
private List<String> userList;
|
||||
private static final String TEST_USERNAME = "test";
|
||||
private static final String TEST2_USERNAME = "test2";
|
||||
private static final String TEST3_USERNAME = "test3";
|
||||
|
||||
@ObjectFactory
|
||||
public IObjectFactory getObjectFactory() {
|
||||
return new org.powermock.modules.testng.PowerMockObjectFactory();
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
public void setup() throws UserStoreException {
|
||||
initMocks(this);
|
||||
userManagementService = new UserManagementServiceImpl();
|
||||
userStoreManager = Mockito.mock(UserStoreManager.class, Mockito.RETURNS_MOCKS);
|
||||
deviceManagementProviderService = Mockito
|
||||
.mock(DeviceManagementProviderServiceImpl.class, Mockito.CALLS_REAL_METHODS);
|
||||
userRealm = Mockito.mock(UserRealm.class);
|
||||
RealmConfiguration realmConfiguration = Mockito.mock(RealmConfiguration.class);
|
||||
Mockito.doReturn(null).when(realmConfiguration).getSecondaryRealmConfig();
|
||||
Mockito.doReturn(realmConfiguration).when(userRealm).getRealmConfiguration();
|
||||
enrollmentInvitation = new EnrollmentInvitation();
|
||||
List<String> recipients = new ArrayList<>();
|
||||
recipients.add(TEST_USERNAME);
|
||||
enrollmentInvitation.setDeviceType("android");
|
||||
enrollmentInvitation.setRecipients(recipients);
|
||||
userList = new ArrayList<>();
|
||||
userList.add(TEST_USERNAME);
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the addUser method of UserManagementService")
|
||||
public void testAddUser() throws UserStoreException, ConfigurationManagementException, DeviceManagementException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
Mockito.doReturn(true).when(userStoreManager).isExistingUser("admin");
|
||||
Mockito.doAnswer(new Answer() {
|
||||
private int count = 0;
|
||||
|
||||
public Object answer(InvocationOnMock invocation) {
|
||||
if (count == 0) {
|
||||
count++;
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}).when(userStoreManager).isExistingUser(TEST_USERNAME);
|
||||
|
||||
Mockito.doReturn("test@test.com").when(userStoreManager)
|
||||
.getUserClaimValue(TEST_USERNAME, Constants.USER_CLAIM_EMAIL_ADDRESS, null);
|
||||
Mockito.doReturn(TEST_USERNAME).when(userStoreManager)
|
||||
.getUserClaimValue(TEST_USERNAME, Constants.USER_CLAIM_FIRST_NAME, null);
|
||||
Mockito.doReturn(TEST_USERNAME).when(userStoreManager)
|
||||
.getUserClaimValue(TEST_USERNAME, Constants.USER_CLAIM_LAST_NAME, null);
|
||||
Mockito.doNothing().when(userStoreManager)
|
||||
.addUser(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
UserInfo userInfo = new UserInfo();
|
||||
userInfo.setUsername("admin");
|
||||
Response response = userManagementService.addUser(userInfo);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.CONFLICT.getStatusCode(),
|
||||
"Same user can be added " + "twice");
|
||||
userInfo = getUserInfo();
|
||||
Mockito.doReturn(true).when(userStoreManager).isExistingRole(DEFAULT_DEVICE_USER);
|
||||
Mockito.doNothing().when(deviceManagementProviderService).sendRegistrationEmail(Mockito.any());
|
||||
response = userManagementService.addUser(userInfo);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.CREATED.getStatusCode(), "User addition failed");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the getUser method of UserManagementService", dependsOnMethods =
|
||||
"testAddUser")
|
||||
public void testGetUser() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Response response = userManagementService.getUser(TEST_USERNAME, null, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(), "User retrieval failed");
|
||||
BasicUserInfo userInfo = (BasicUserInfo) response.getEntity();
|
||||
Assert.assertEquals(userInfo.getFirstname(), TEST_USERNAME,
|
||||
"Retrieved user object is different from the original one " + "saved");
|
||||
|
||||
Mockito.doReturn(false).when(userStoreManager).isExistingUser(TEST2_USERNAME);
|
||||
response = userManagementService.getUser(TEST2_USERNAME, null, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode(),
|
||||
"Non-existing user was retrieved successfully");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the updateUser method of UserManagementService", dependsOnMethods =
|
||||
{"testGetUser"})
|
||||
public void testUpdateUser() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Response response = userManagementService.updateUser(TEST2_USERNAME, null, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode(),
|
||||
"Non-existing user was successfully updated");
|
||||
String[] roles = { "Internal/everyone", DEFAULT_DEVICE_USER };
|
||||
Mockito.doReturn(roles).when(userStoreManager).getRoleListOfUser(TEST_USERNAME);
|
||||
Mockito.doNothing().when(userStoreManager).updateRoleListOfUser(Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doNothing().when(userStoreManager).setUserClaimValues(Mockito.any(), Mockito.any(), Mockito.any());
|
||||
response = userManagementService.updateUser(TEST_USERNAME, null, getUserInfo());
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(), "Updating the user info failed");
|
||||
}
|
||||
|
||||
|
||||
@Test(description = "This method tests the getRolesOfUser method of UserManagementService", dependsOnMethods =
|
||||
{"testUpdateUser"})
|
||||
public void testGetRolesOfUser() {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Response response = userManagementService.getRolesOfUser(TEST2_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode(),
|
||||
"Roles of a non-existing user was successfully retrieved");
|
||||
response = userManagementService.getRolesOfUser(TEST_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Retrieval of roles of a existing user failed.");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the IsUserExists method of UserManagementService", dependsOnMethods =
|
||||
{"testGetRolesOfUser"})
|
||||
public void testIsUserExists() {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Response response = userManagementService.isUserExists(TEST2_USERNAME);
|
||||
boolean responseEntity = (boolean) response.getEntity();
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Check for existence of user failed");
|
||||
Assert.assertFalse(responseEntity, "Non-existing user is identified as already existing user");
|
||||
response = userManagementService.isUserExists(TEST_USERNAME);
|
||||
responseEntity = (boolean) response.getEntity();
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Check for existence of user failed");
|
||||
Assert.assertTrue(responseEntity, "Existing user is identified as non-existing user");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the send invitation method of UserManagementService", dependsOnMethods =
|
||||
{"testIsUserExists"})
|
||||
public void testSendInvitation() throws ConfigurationManagementException, DeviceManagementException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
Mockito.doNothing().when(deviceManagementProviderService).sendEnrolmentInvitation(Mockito.any(), Mockito.any());
|
||||
Response response = userManagementService.inviteExistingUsersToEnrollDevice(userList);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Inviting existing users to enroll device failed");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the getUserNames method of UserManagementService", dependsOnMethods =
|
||||
{"testSendInvitation"})
|
||||
public void testGetUserNames() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Mockito.doReturn(new String[] { TEST_USERNAME }).when(userStoreManager).listUsers(Mockito.anyString(), Mockito.anyInt());
|
||||
Response response = userManagementService
|
||||
.getUserNames(TEST_USERNAME, null, "00", 0, 0);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Getting user names is failed for a valid request");
|
||||
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the getUsers method of UserManagementService",
|
||||
dependsOnMethods = {"testGetUserNames"})
|
||||
public void testGetUsers() {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(userStoreManager);
|
||||
Response response = userManagementService.getUsers(null, "00", 0, 10);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(), "GetUsers request failed");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the inviteToEnrollDevice method of UserManagementService",
|
||||
dependsOnMethods = "testGetUsers")
|
||||
public void testInviteToEnrollDevice() {
|
||||
URL resourceUrl = ClassLoader.getSystemResource("testng.xml");
|
||||
System.setProperty("carbon.home", resourceUrl.getPath());
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getAuthenticatedUser")).toReturn(TEST_USERNAME);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
EnrollmentInvitation enrollmentInvitation = new EnrollmentInvitation();
|
||||
List<String> recipients = new ArrayList<>();
|
||||
recipients.add(TEST_USERNAME);
|
||||
enrollmentInvitation.setDeviceType("android");
|
||||
enrollmentInvitation.setRecipients(recipients);
|
||||
Response response = userManagementService.inviteToEnrollDevice(enrollmentInvitation);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Inviting users to enroll device failed");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the removeUser method of UserManagementService", dependsOnMethods =
|
||||
"testInviteToEnrollDevice")
|
||||
public void testRemoveUser() throws DeviceManagementException, UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
Mockito.doReturn(true).when(deviceManagementProviderService).setStatus(Mockito.anyString(), Mockito.any());
|
||||
Mockito.doNothing().when(userStoreManager).deleteUser(Mockito.anyString());
|
||||
Response response = userManagementService.removeUser(TEST_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
|
||||
"Cannot remove user, the request failed");
|
||||
response = userManagementService.removeUser(TEST2_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode(),
|
||||
"Successfully removed non-existing user");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the behaviour of getUserCount method of UserManagementService",
|
||||
dependsOnMethods = {"testRemoveUser"})
|
||||
public void testGetUserCount() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserRealm")).toReturn(userRealm);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreCountRetrieverService"))
|
||||
.toReturn(null);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Response response = userManagementService.getUserCount();
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(), "User count retrieval failed");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the behaviour of methods when there is an issue with "
|
||||
+ "DeviceManagementProviderService", dependsOnMethods = {"testGetUserCount"})
|
||||
public void testNegativeScenarios1() throws ConfigurationManagementException, DeviceManagementException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getAuthenticatedUser")).toReturn(TEST_USERNAME);
|
||||
Mockito.reset(deviceManagementProviderService);
|
||||
Mockito.doThrow(new DeviceManagementException()).when(deviceManagementProviderService)
|
||||
.sendEnrolmentInvitation(Mockito.any(), Mockito.any());
|
||||
Response response = userManagementService.inviteExistingUsersToEnrollDevice(userList);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Invite existing users to enroll device succeeded under erroneous conditions");
|
||||
response = userManagementService.inviteToEnrollDevice(enrollmentInvitation);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Invite existing users to enroll device succeeded under erroneous conditions");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the behaviour of the different methods when there is an issue is "
|
||||
+ "userStoreManager", dependsOnMethods = {"testNegativeScenarios1"})
|
||||
public void testNegativeScenarios2() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
Mockito.doThrow(new UserStoreException()).when(userStoreManager).isExistingUser(TEST3_USERNAME);
|
||||
Response response = userManagementService.getUser(TEST3_USERNAME, null, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user retrieval with problematic inputs");
|
||||
UserInfo userInfo = new UserInfo();
|
||||
userInfo.setUsername(TEST3_USERNAME);
|
||||
response = userManagementService.addUser(userInfo);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user addition with problematic inputs");
|
||||
response = userManagementService.updateUser(TEST3_USERNAME, null, userInfo);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user updating request with problematic inputs");
|
||||
response = userManagementService.removeUser(TEST3_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user removal request with problematic inputs");
|
||||
response = userManagementService.getRolesOfUser(TEST3_USERNAME, null);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user role retrieval request with problematic inputs");
|
||||
response = userManagementService.isUserExists(TEST3_USERNAME);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for checking existence of user under problematic conditions");
|
||||
}
|
||||
|
||||
@Test(description = "This method tests the behaviour of various methods when there is an issue with UserStore "
|
||||
+ "Manager", dependsOnMethods = {"testNegativeScenarios2"})
|
||||
public void testNegativeScenarios3() throws UserStoreException {
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreManager"))
|
||||
.toReturn(this.userStoreManager);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserRealm")).toReturn(userRealm);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getUserStoreCountRetrieverService"))
|
||||
.toReturn(null);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getAuthenticatedUser")).toReturn(TEST_USERNAME);
|
||||
PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDeviceManagementService"))
|
||||
.toReturn(this.deviceManagementProviderService);
|
||||
Mockito.reset(this.userStoreManager);
|
||||
Mockito.doThrow(new UserStoreException()).when(userStoreManager)
|
||||
.getUserClaimValue(Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doThrow(new UserStoreException()).when(userStoreManager)
|
||||
.listUsers(Mockito.anyString(), Mockito.anyInt());
|
||||
Response response = userManagementService.getUsers(TEST_USERNAME, "00", 0, 10);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a users retrieval request.");
|
||||
response = userManagementService.getUserCount();
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user count retrieval request.");
|
||||
response = userManagementService.getUserNames(TEST_USERNAME, null, "00", 0, 10);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Response returned successful for a user count retrieval request.");
|
||||
response = userManagementService.inviteToEnrollDevice(enrollmentInvitation);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Invite existing users to enroll device succeeded under erroneous conditions");
|
||||
response = userManagementService.inviteExistingUsersToEnrollDevice(userList);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
|
||||
"Invite existing users to enroll device succeeded under erroneous conditions");
|
||||
}
|
||||
|
||||
/**
|
||||
* To get the user info of a user
|
||||
*
|
||||
* @return UserInfo of the User.
|
||||
*/
|
||||
private UserInfo getUserInfo() {
|
||||
UserInfo userInfo = new UserInfo();
|
||||
userInfo.setUsername(TEST_USERNAME);
|
||||
userInfo.setFirstname(TEST_USERNAME);
|
||||
userInfo.setLastname(TEST_USERNAME);
|
||||
userInfo.setEmailAddress("test@test.com");
|
||||
return userInfo;
|
||||
}
|
||||
|
||||
}
|
||||
@ -28,6 +28,7 @@
|
||||
<class name="org.wso2.carbon.device.mgt.jaxrs.service.impl.DeviceTypeManagementServiceTest"/>
|
||||
<class name="org.wso2.carbon.device.mgt.jaxrs.service.impl.DeviceTypeManagementAdminServiceTest"/>
|
||||
<class name="org.wso2.carbon.device.mgt.jaxrs.service.impl.DeviceAgentServiceTest"/>
|
||||
<class name="org.wso2.carbon.device.mgt.jaxrs.service.impl.UserManagementServiceImplTest"/>
|
||||
</classes>
|
||||
</test>
|
||||
</suite>
|
||||
|
||||
@ -60,17 +60,9 @@ import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
|
||||
import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
|
||||
import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository;
|
||||
import org.wso2.carbon.device.mgt.core.cache.impl.DeviceCacheManagerImpl;
|
||||
import org.wso2.carbon.device.mgt.core.dao.ApplicationDAO;
|
||||
import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
|
||||
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
|
||||
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
|
||||
import org.wso2.carbon.device.mgt.core.dao.EnrollmentDAO;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
|
||||
import org.wso2.carbon.device.mgt.core.dao.*;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsDAO;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsMgtDAOException;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.impl.DeviceInformationManagerImpl;
|
||||
import org.wso2.carbon.device.mgt.core.dto.DeviceType;
|
||||
import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier;
|
||||
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
|
||||
@ -250,7 +242,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int enrolmentId = 0;
|
||||
int enrolmentId;
|
||||
try {
|
||||
DeviceManagementDAOFactory.beginTransaction();
|
||||
DeviceType type = deviceTypeDAO.getDeviceType(device.getType(), tenantId);
|
||||
@ -363,7 +355,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Get enrollments for user '" + user + "' device: " + deviceId);
|
||||
}
|
||||
List<EnrolmentInfo> enrolmentInfos = new ArrayList<>();
|
||||
List<EnrolmentInfo> enrolmentInfos;
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
enrolmentInfos = enrollmentDAO.getEnrollmentsOfUser(deviceId, user, this.getTenantId());
|
||||
@ -453,10 +445,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
@Override
|
||||
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
|
||||
Device device = this.getDevice(deviceId, false);
|
||||
if (device != null) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return device != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -627,8 +616,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
+ requireDeviceInfo);
|
||||
}
|
||||
PaginationResult paginationResult = new PaginationResult();
|
||||
List<Device> allDevices = new ArrayList<>();
|
||||
int count = 0;
|
||||
List<Device> allDevices;
|
||||
int count;
|
||||
int tenantId = this.getTenantId();
|
||||
String deviceType = request.getDeviceType();
|
||||
request = DeviceManagerUtil.validateDeviceListPageSize(request);
|
||||
@ -679,9 +668,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Get devices with pagination " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo);
|
||||
}
|
||||
List<Device> devicesForRoles = null;
|
||||
List<Device> devicesForRoles;
|
||||
PaginationResult paginationResult = new PaginationResult();
|
||||
List<Device> allDevices = new ArrayList<>();
|
||||
List<Device> allDevices;
|
||||
int count = 0;
|
||||
int tenantId = this.getTenantId();
|
||||
request = DeviceManagerUtil.validateDeviceListPageSize(request);
|
||||
@ -785,7 +774,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
" and owner '" + owner + "' and requiredDeviceInfo: " + requireDeviceInfo);
|
||||
}
|
||||
int tenantId = this.getTenantId();
|
||||
Device device = null;
|
||||
Device device;
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
device = deviceDAO.getDevice(deviceId, owner, tenantId);
|
||||
@ -835,12 +824,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
Enumeration e = props.propertyNames();
|
||||
while (e.hasMoreElements()) {
|
||||
String key = (String) e.nextElement();
|
||||
params.put(key, new TypedValue<Class<?>, Object>(String.class, props.getProperty(key)));
|
||||
params.put(key, new TypedValue<>(String.class, props.getProperty(key)));
|
||||
}
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.SERVER_BASE_URL_HTTPS,
|
||||
new TypedValue<Class<?>, Object>(String.class, DeviceManagerUtil.getServerBaseHttpsUrl()));
|
||||
new TypedValue<>(String.class, DeviceManagerUtil.getServerBaseHttpsUrl()));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.SERVER_BASE_URL_HTTP,
|
||||
new TypedValue<Class<?>, Object>(String.class, DeviceManagerUtil.getServerBaseHttpUrl()));
|
||||
new TypedValue<>(String.class, DeviceManagerUtil.getServerBaseHttpUrl()));
|
||||
try {
|
||||
EmailContext ctx =
|
||||
new EmailContext.EmailContextBuilder(new ContentProviderInfo(templateName, params),
|
||||
@ -875,17 +864,17 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
if (emailSenderService != null) {
|
||||
Map<String, TypedValue<Class<?>, Object>> params = new HashMap<>();
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.FIRST_NAME,
|
||||
new TypedValue<Class<?>, Object>(String.class, metaInfo.getProperty("first-name")));
|
||||
new TypedValue<>(String.class, metaInfo.getProperty("first-name")));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.USERNAME,
|
||||
new TypedValue<Class<?>, Object>(String.class, metaInfo.getProperty("username")));
|
||||
new TypedValue<>(String.class, metaInfo.getProperty("username")));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.PASSWORD,
|
||||
new TypedValue<Class<?>, Object>(String.class, metaInfo.getProperty("password")));
|
||||
new TypedValue<>(String.class, metaInfo.getProperty("password")));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.DOMAIN,
|
||||
new TypedValue<Class<?>, Object>(String.class, metaInfo.getProperty("domain")));
|
||||
new TypedValue<>(String.class, metaInfo.getProperty("domain")));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.SERVER_BASE_URL_HTTPS,
|
||||
new TypedValue<Class<?>, Object>(String.class, DeviceManagerUtil.getServerBaseHttpsUrl()));
|
||||
new TypedValue<>(String.class, DeviceManagerUtil.getServerBaseHttpsUrl()));
|
||||
params.put(org.wso2.carbon.device.mgt.core.DeviceManagementConstants.EmailAttributes.SERVER_BASE_URL_HTTP,
|
||||
new TypedValue<Class<?>, Object>(String.class, DeviceManagerUtil.getServerBaseHttpUrl()));
|
||||
new TypedValue<>(String.class, DeviceManagerUtil.getServerBaseHttpUrl()));
|
||||
try {
|
||||
EmailContext ctx =
|
||||
new EmailContext.EmailContextBuilder(
|
||||
@ -1284,7 +1273,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
log.debug("Update enrollment with status");
|
||||
}
|
||||
try {
|
||||
boolean success = false;
|
||||
boolean success;
|
||||
int tenantId = this.getTenantId();
|
||||
DeviceManagementDAOFactory.beginTransaction();
|
||||
success = enrollmentDAO.setStatus(currentOwner, status, tenantId);
|
||||
@ -1607,10 +1596,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
+ requireDeviceInfo);
|
||||
}
|
||||
PaginationResult result = new PaginationResult();
|
||||
int deviceCount = 0;
|
||||
int deviceCount;
|
||||
int tenantId = this.getTenantId();
|
||||
String username = request.getOwner();
|
||||
List<Device> userDevices = new ArrayList<>();
|
||||
List<Device> userDevices;
|
||||
request = DeviceManagerUtil.validateDeviceListPageSize(request);
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
@ -1662,7 +1651,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
}
|
||||
PaginationResult result = new PaginationResult();
|
||||
List<Device> allDevices;
|
||||
int deviceCount = 0;
|
||||
int deviceCount;
|
||||
int tenantId = this.getTenantId();
|
||||
String ownerShip = request.getOwnership();
|
||||
request = DeviceManagerUtil.validateDeviceListPageSize(request);
|
||||
@ -1729,7 +1718,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
|
||||
List<Device> userDevices;
|
||||
for (String user : users) {
|
||||
userDevices = new ArrayList<>();
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
userDevices = deviceDAO.getDevicesOfUser(user, tenantId);
|
||||
@ -1865,7 +1853,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
}
|
||||
PaginationResult result = new PaginationResult();
|
||||
int tenantId = this.getTenantId();
|
||||
List<Device> allDevices = new ArrayList<>();
|
||||
List<Device> allDevices;
|
||||
String deviceName = request.getDeviceName();
|
||||
request = DeviceManagerUtil.validateDeviceListPageSize(request);
|
||||
try {
|
||||
@ -2019,10 +2007,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
@Override
|
||||
public boolean isEnrolled(DeviceIdentifier deviceId, String user) throws DeviceManagementException {
|
||||
Device device = this.getDevice(deviceId, false);
|
||||
if (device != null && device.getEnrolmentInfo() != null && device.getEnrolmentInfo().getOwner().equals(user)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return device != null && device.getEnrolmentInfo() != null && device.getEnrolmentInfo().getOwner().equals(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -2056,7 +2041,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
log.debug("Change device status of device: " + deviceIdentifier.getId() + " of type '"
|
||||
+ deviceIdentifier.getType() + "'");
|
||||
}
|
||||
boolean isDeviceUpdated = false;
|
||||
boolean isDeviceUpdated;
|
||||
Device device = getDevice(deviceIdentifier, false);
|
||||
int deviceId = device.getId();
|
||||
EnrolmentInfo enrolmentInfo = device.getEnrolmentInfo();
|
||||
@ -2251,7 +2236,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
* @param service {@link GroupManagementProviderService} instance.
|
||||
* @param groupName of the group to create.
|
||||
* @return Group with details.
|
||||
* @throws GroupManagementException
|
||||
* @throws GroupManagementException Group Management Exception
|
||||
*/
|
||||
private DeviceGroup createDefaultGroup(GroupManagementProviderService service, String groupName)
|
||||
throws GroupManagementException {
|
||||
@ -2460,27 +2445,25 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
log.debug("Get all device info of devices, num of devices: " + allDevices.size());
|
||||
}
|
||||
List<Device> devices = new ArrayList<>();
|
||||
if (allDevices != null) {
|
||||
for (Device device : allDevices) {
|
||||
device.setDeviceInfo(this.getDeviceInfo(device));
|
||||
device.setApplications(this.getInstalledApplications(device));
|
||||
DeviceManager deviceManager = this.getDeviceManager(device.getType());
|
||||
if (deviceManager == null) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Device Manager associated with the device type '" + device.getType() + "' is null. " +
|
||||
"Therefore, not attempting method 'isEnrolled'");
|
||||
}
|
||||
devices.add(device);
|
||||
continue;
|
||||
}
|
||||
Device dmsDevice =
|
||||
deviceManager.getDevice(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
|
||||
if (dmsDevice != null) {
|
||||
device.setFeatures(dmsDevice.getFeatures());
|
||||
device.setProperties(dmsDevice.getProperties());
|
||||
for (Device device : allDevices) {
|
||||
device.setDeviceInfo(this.getDeviceInfo(device));
|
||||
device.setApplications(this.getInstalledApplications(device));
|
||||
DeviceManager deviceManager = this.getDeviceManager(device.getType());
|
||||
if (deviceManager == null) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Device Manager associated with the device type '" + device.getType() + "' is null. " +
|
||||
"Therefore, not attempting method 'isEnrolled'");
|
||||
}
|
||||
devices.add(device);
|
||||
continue;
|
||||
}
|
||||
Device dmsDevice =
|
||||
deviceManager.getDevice(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
|
||||
if (dmsDevice != null) {
|
||||
device.setFeatures(dmsDevice.getFeatures());
|
||||
device.setProperties(dmsDevice.getProperties());
|
||||
}
|
||||
devices.add(device);
|
||||
}
|
||||
return devices;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user