From 278cd871552397b74305b4e990e32033b6a8cbd3 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Thu, 6 Jul 2023 17:15:53 +0530
Subject: [PATCH] fixed unit tests

---
 .../io.entgra.device.mgt.plugins.mobile.android.api/pom.xml | 6 +-----
 .../android/api/DeviceManagementAdminServiceTests.java      | 3 ++-
 pom.xml                                                     | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
index bc64543e5..87e9efe21 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
@@ -306,7 +306,7 @@
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -349,8 +349,4 @@
             <artifactId>jackson-core-asl</artifactId>
         </dependency>
     </dependencies>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
 </project>
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java
index 1b5bc301e..f38864b0e 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java
@@ -25,6 +25,7 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.Assert;
 import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
@@ -40,7 +41,7 @@ import javax.ws.rs.core.Response;
 
 @PowerMockIgnore({"javax.ws.rs.*", "org.apache.log4j.*"})
 @PrepareForTest(AndroidAPIUtils.class)
-public class DeviceManagementAdminServiceTests {
+public class DeviceManagementAdminServiceTests extends PowerMockTestCase {
 
     private DeviceManagementAdminServiceImpl deviceManagementAdminService;
 
diff --git a/pom.xml b/pom.xml
index c89775a74..72164586e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -865,7 +865,7 @@
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
+                <artifactId>powermock-api-mockito2</artifactId>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -1071,7 +1071,7 @@
         <ant.contrib.version>1.0b3</ant.contrib.version>
         <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
         <javassist.version>3.12.1.GA</javassist.version>
-        <powermock.version>1.7.4</powermock.version>
+        <powermock.version>2.0.2</powermock.version>
 
         <squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
         <okio.version>1.13.0</okio.version>