inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
4.x.x
sinthuja 7 years ago
parent 0252a5f2eb
commit 10365c108b
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File

5
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/ApplicationPersistenceTests.java
Unescape View File

@ -57,9 +57,8 @@ public class ApplicationPersistenceTests extends BaseDeviceManagementTest {
} }
if (!isMock()) { if (!isMock()) {
Assert.assertEquals(target.getApplicationIdentifier(), testAppIdentifier, "Application added is not as same as " + Assert.assertEquals(target.getApplicationIdentifier(), testAppIdentifier,
"what's " + "Application added is not as same as what's retrieved");
"retrieved");
} }
} }

33
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java
Unescape View File

@ -153,7 +153,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
connection.addMockStatement(mockStatement); connection.addMockStatement(mockStatement);
datasourceField.set(datasourceField, dataSource); datasourceField.set(datasourceField, dataSource);
} }
try { try {
boolean enrollmentStatus = deviceMgtService.enrollDevice(device); boolean enrollmentStatus = deviceMgtService.enrollDevice(device);
@ -163,7 +162,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
dataSource.reset(); dataSource.reset();
} }
} }
} }
@Test(dependsOnMethods = "testSuccessfulDeviceEnrollment") @Test(dependsOnMethods = "testSuccessfulDeviceEnrollment")
@ -211,7 +209,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
@Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"}) @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
public void testReEnrollmentofSameDeviceWithOtherUser() throws DeviceManagementException { public void testReEnrollmentofSameDeviceWithOtherUser() throws DeviceManagementException {
if (!isMock()) { if (!isMock()) {
EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
enrolmentInfo.setDateOfEnrolment(new Date().getTime()); enrolmentInfo.setDateOfEnrolment(new Date().getTime());
enrolmentInfo.setDateOfLastUpdate(new Date().getTime()); enrolmentInfo.setDateOfLastUpdate(new Date().getTime());
@ -446,29 +443,9 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
@Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}) @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
public void testDeviceByDate() throws DeviceManagementException, TransactionManagementException, public void testDeviceByDate() throws DeviceManagementException, TransactionManagementException,
DeviceDetailsMgtDAOException, NoSuchFieldException, IllegalAccessException { DeviceDetailsMgtDAOException, NoSuchFieldException, IllegalAccessException {
MockDataSource dataSource = null; MockDataSource dataSource = setDatasourceForGetDevice();
if (isMock()) { if (dataSource != null) {
Field datasourceField = DeviceManagementDAOFactory.class.getDeclaredField("dataSource"); setMockDeviceCount(dataSource.getConnection(0));
datasourceField.setAccessible(true);
dataSource = (MockDataSource) getDataSource();
//connection used for first get device operation.
MockConnection connection = new MockConnection(dataSource.getUrl());
dataSource.setConnection(connection);
MockStatement mockStatement = new MockStatement();
mockStatement.addResultSet(getMockGetDeviceResult());
connection.addMockStatement(mockStatement);
//connection used for the add device information operation.
dataSource.setConnection(new MockConnection(dataSource.getUrl()));
//connection used for second get device operation.
connection = new MockConnection(dataSource.getUrl());
dataSource.setConnection(connection);
mockStatement = new MockStatement();
mockStatement.addResultSet(getMockGetDeviceResult());
connection.addMockStatement(mockStatement);
datasourceField.set(datasourceField, dataSource);
} }
Device initialDevice = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID, Device initialDevice = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID,
DEVICE_TYPE)); DEVICE_TYPE));
@ -744,7 +721,7 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
PaginationRequest request = new PaginationRequest(0, 100); PaginationRequest request = new PaginationRequest(0, 100);
request.setOwner("admin"); request.setOwner("admin");
MockDataSource dataSource = setDatasourceForGetDevice(); MockDataSource dataSource = setDatasourceForGetDevice();
if (dataSource != null){ if (dataSource != null) {
setMockDeviceCount(dataSource.getConnection(0)); setMockDeviceCount(dataSource.getConnection(0));
} }
PaginationResult result = deviceMgtService.getDevicesOfUser(request, true); PaginationResult result = deviceMgtService.getDevicesOfUser(request, true);
@ -766,7 +743,7 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
PaginationRequest request = new PaginationRequest(0, 100); PaginationRequest request = new PaginationRequest(0, 100);
request.setOwnership(EnrolmentInfo.OwnerShip.BYOD.toString()); request.setOwnership(EnrolmentInfo.OwnerShip.BYOD.toString());
MockDataSource dataSource = setDatasourceForGetDevice(); MockDataSource dataSource = setDatasourceForGetDevice();
if (dataSource != null){ if (dataSource != null) {
setMockDeviceCount(dataSource.getConnection(0)); setMockDeviceCount(dataSource.getConnection(0));
} }
PaginationResult result = deviceMgtService.getDevicesByOwnership(request); PaginationResult result = deviceMgtService.getDevicesByOwnership(request);

Write Preview
Loading…
Cancel
Save