refactoring

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java

@@ -38,7 +38,6 @@ import java.util.concurrent.ConcurrentHashMap;
     Unit tests for DeviceTypePluginDeployer
  */
 public class DeviceTypePluginDeployerTest {
-
     private DeviceTypePluginDeployer deviceTypePluginDeployer;
     private DeploymentFileData deploymentFileData;
     private Field deviceTypeServiceRegistrations = null;
@@ -68,7 +67,6 @@ public class DeviceTypePluginDeployerTest {
             File file = new File("src/test/resources");
             if (file.exists()) {
                 System.setProperty("carbon.home", file.getAbsolutePath());
-
             }
         }
         PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
   ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -380,4 +379,4 @@
         <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
         <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
     </DeviceStatusTaskConfig>
-</DeviceTypeConfiguration>
+</DeviceTypeConfiguration>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml

@@ -1,4 +1,3 @@
-
 <!--
   ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -26,4 +25,4 @@
             <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
         </classes>
     </test>
-</suite>
+</suite>

components/test-coverage/pom.xml

@@ -192,7 +192,9 @@
                                                 <fileset dir="${api.extension.handlers}/${target}/${coverge-report}">
                                                     <include name="${individual.test.report.name}" />
                                                 </fileset>
-
+                                                <fileset dir="${device.extensions.deployer}/${target}/${coverge-report}">
+                                                    <include name="${individual.test.report.name}" />
+                                                </fileset>
                                                 <!-- Need to list the newly added exec files here -->
                                             </executiondata>
                                             <structure name="Carbon Device Management Component Coverage Report">