From 1d94fb7de14b42ccd01d2bdcdd7adf935dbc5b84 Mon Sep 17 00:00:00 2001
From: Dharmakeerthi Lasantha <tcdlpds@gmail.com>
Date: Tue, 18 Jul 2023 09:16:25 +0530
Subject: [PATCH] Fix test case failing

---
 .../pom.xml                                       | 15 +++++++++++----
 .../mgt/core/mgt/impl/PolicyManagerImpl.java      |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
index f93f462924..0e518faf96 100644
--- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
@@ -70,6 +70,8 @@
                             io.entgra.device.mgt.core.device.mgt.core.operation.mgt;version="[5.0,6)",
                             io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)",
                             io.entgra.device.mgt.core.device.mgt.core.task.impl;version="[5.0,6)",
+                            io.entgra.device.mgt.core.notification.logger;version="[5.0,6)",
+                            io.entgra.device.mgt.core.notification.logger.impl;version="[5.0,6)",
                             io.entgra.device.mgt.core.policy.mgt.common;version="[5.0,6)",
                             io.entgra.device.mgt.core.policy.mgt.common.monitor;version="[5.0,6)",
                             io.entgra.device.mgt.core.policy.mgt.core.cache,
@@ -126,9 +128,9 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
-                    <classpathDependencyExcludes>
-                        <classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
-                    </classpathDependencyExcludes>
+<!--                    <classpathDependencyExcludes>-->
+<!--                        <classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>-->
+<!--                    </classpathDependencyExcludes>-->
                 </configuration>
             </plugin>
             <plugin>
@@ -169,7 +171,7 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <scope>provided</scope>
+<!--            <scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -283,9 +285,14 @@
             <groupId>org.wso2.orbit.javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/PolicyManagerImpl.java b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
index 6b710b259b..63eb01b200 100644
--- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
+++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
@@ -642,8 +642,8 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public void activatePolicy(int policyId) throws PolicyManagementException {
+        Policy policy = this.getPolicy(policyId);
         try {
-            Policy policy = this.getPolicy(policyId);
             PolicyManagementDAOFactory.beginTransaction();
             policyDAO.activatePolicy(policyId);
             policyDAO.recordUpdatedPolicy(policy);