From 026e70824cc6494078afd49cdda827c3b50599f0 Mon Sep 17 00:00:00 2001
From: GDLMadushanka <gdlmadushanka@gmail.com>
Date: Thu, 12 Oct 2017 13:13:23 +0530
Subject: [PATCH] refactoring

---
 .../device/type/deployer/DeviceTypePluginDeployerTest.java    | 2 --
 .../src/test/resources/android.xml                            | 3 +--
 .../src/test/resources/testng.xml                             | 3 +--
 components/test-coverage/pom.xml                              | 4 +++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/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 b/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
index 2cb00848da..7f158ff569 100644
--- a/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
+++ b/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(
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml
index 80555b5803..21db962414 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml
+++ b/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>
\ No newline at end of file
+</DeviceTypeConfiguration>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml
index dcf3e7ec5c..d0ea4e8805 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml
+++ b/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>
\ No newline at end of file
+</suite>
diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml
index cb02da5e89..74f1da130a 100644
--- a/components/test-coverage/pom.xml
+++ b/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">