Refactoring

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerTest.java

@@ -90,6 +90,15 @@ public class DeviceTypeManagerTest {
         if (resourceUrl != null) {
             androidConfiguration = new File(resourceUrl.getFile());
         }
+        datasourceField = DeviceTypeDAOHandler.class.getDeclaredField("dataSource");
+        datasourceField.setAccessible(true);
+        currentConnection = DeviceTypeDAOHandler.class.getDeclaredField("currentConnection");
+        currentConnection.setAccessible(true);
+        deviceTypePluginDAOField = DeviceTypePluginDAOManager.class.getDeclaredField("deviceTypePluginDAO");
+        deviceTypePluginDAOField.setAccessible(true);
+        deviceTypeDAOHandlerField = DeviceTypePluginDAOManager.class.getDeclaredField("deviceTypeDAOHandler");
+        deviceTypeDAOHandlerField.setAccessible(true);
+
         DeviceTypeConfiguration androidDeviceConfiguration = Utils.getDeviceTypeConfiguration(androidConfiguration);
         androidDeviceTypeManager = Mockito.mock(DeviceTypeManager.class, Mockito.CALLS_REAL_METHODS);
         customDeviceTypeManager = Mockito.mock(DeviceTypeManager.class, Mockito.CALLS_REAL_METHODS);
@@ -108,15 +117,6 @@ public class DeviceTypeManagerTest {
         Field deviceType = DeviceTypeManager.class.getDeclaredField("deviceType");
         deviceType.setAccessible(true);
 
-        datasourceField = DeviceTypeDAOHandler.class.getDeclaredField("dataSource");
-        datasourceField.setAccessible(true);
-        currentConnection = DeviceTypeDAOHandler.class.getDeclaredField("currentConnection");
-        currentConnection.setAccessible(true);
-        deviceTypePluginDAOField = DeviceTypePluginDAOManager.class.getDeclaredField("deviceTypePluginDAO");
-        deviceTypePluginDAOField.setAccessible(true);
-        deviceTypeDAOHandlerField = DeviceTypePluginDAOManager.class.getDeclaredField("deviceTypeDAOHandler");
-        deviceTypeDAOHandlerField.setAccessible(true);
-
         deviceType.set(androidDeviceTypeManager, androidDeviceType);
         propertiesExist.set(androidDeviceTypeManager, true);
         createAndroidDevice();

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/java/org/wso2/carbon/device/mgt/extensions/utils/Utils.java

@@ -106,7 +106,6 @@ public class Utils {
         dataSource.setUser("sa");
         dataSource.setPassword("sa");
 
-
         File file = new File(scriptFilePath);
 
         final String LOAD_DATA_QUERY = "RUNSCRIPT FROM '" + file.getCanonicalPath() + "'";