From 2c9369dae09b5925ac78709cc6432532b1c37f4e Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Mon, 25 Sep 2017 23:30:24 +0530
Subject: [PATCH] Refactoring

---
 .../pom.xml                                   |  3 --
 .../src/test/resources/log4j.properties       | 34 -------------------
 .../src/test/resources/testng.xml             |  5 ++-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/log4j.properties

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
index 0335c8b871..41324a1716 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
@@ -137,9 +137,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemPropertyVariables>
-                        <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
-                    </systemPropertyVariables>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/log4j.properties b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/log4j.properties
deleted file mode 100644
index e415fd607d..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# WSO2 Inc. licenses this file to you under the Apache License,
-# Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#
-# This is the log4j configuration file used by WSO2 Carbon
-#
-# IMPORTANT : Please do not remove or change the names of any
-# of the Appender defined here. The layout pattern & log file
-# can be changed using the WSO2 Carbon Management Console, and those
-# settings will override the settings in this file.
-#
-
-log4j.rootLogger=DEBUG, STD_OUT
- 
-# Redirect log messages to console
-log4j.appender.STD_OUT=org.apache.log4j.ConsoleAppender
-log4j.appender.STD_OUT.Target=System.out
-log4j.appender.STD_OUT.layout=org.apache.log4j.PatternLayout
-log4j.appender.STD_OUT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/testng.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/testng.xml
index ed81332037..026b63df9a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/testng.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/testng.xml
@@ -1,4 +1,3 @@
-
 <!--
   ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -22,9 +21,9 @@
 <suite name="DeviceManagementExtensions">
     <parameter name="useDefaultListeners" value="false"/>
 
-    <test name="DeviceType Manager Test Cases" preserve-order="true">
+    <test name="DeviceType Manager Service Test Cases" preserve-order="true">
         <classes>
-            <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerServiceTest"/>-->
+            <class name="org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerServiceTest"/>
         </classes>
     </test>
 </suite>