From ebe2a7bd6b2d127024e5db852e01430750e5f505 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Wed, 27 Sep 2017 14:56:43 +0530
Subject: [PATCH] Moved dependency versioning to parent pom and fixed the test
 failure.

---
 .../org.wso2.carbon.device.mgt.core/pom.xml   |  4 ---
 .../mgt/PermissionManagerServiceTest.java     | 34 +++++++++++++++----
 pom.xml                                       |  8 ++++-
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index a7771512a10..f5193fe9786 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -224,14 +224,10 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-testng</artifactId>
-            <version>1.7.0</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.0</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java
index 20675811cf3..7f6c20ba814 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java
@@ -17,7 +17,8 @@
  */
 package org.wso2.carbon.device.mgt.core.permission.mgt;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.testng.Assert;
@@ -38,10 +39,10 @@ import static org.mockito.MockitoAnnotations.initMocks;
 public class PermissionManagerServiceTest {
 
     private Permission permission;
-    private Logger log = Logger.getLogger(PermissionManagerServiceTest.class);
+    private Log log;
     private String PERMISSION_URL = "permission/admin/device-mgt/test/testPermission";
     private String PERMISSION_PATH = "permission/admin/device-mgt/test/testPermission";
-    private String PERMiSSION_METHOD = "ui.execute";
+    private String PERMISSION_METHOD = "ui.execute";
     private String PERMISSION_NAME = "Test Permission";
 
     //For create properties to retrieve permission.
@@ -57,12 +58,13 @@ public class PermissionManagerServiceTest {
 
     @BeforeClass
     public void init() throws RegistryException {
-        permissionManagerService = PermissionManagerServiceImpl.getInstance();
         initMocks(this);
+        log = LogFactory.getLog(PermissionManagerServiceTest.class);
+        permissionManagerService = PermissionManagerServiceImpl.getInstance();
         this.permission = new Permission();
         permission.setName(PERMISSION_NAME);
         permission.setPath(PERMISSION_PATH);
-        permission.setMethod(PERMiSSION_METHOD);
+        permission.setMethod(PERMISSION_METHOD);
         permission.setUrl(PERMISSION_URL);
     }
 
@@ -83,12 +85,19 @@ public class PermissionManagerServiceTest {
     public void testGetPermission() throws PermissionManagementException {
         Permission permission = permissionManagerService.getPermission(createProperties());
 
-        Assert.assertEquals(permission.getMethod(), PERMiSSION_METHOD);
+        Assert.assertEquals(permission.getMethod(), PERMISSION_METHOD);
         Assert.assertEquals(permission.getName(), PERMISSION_NAME);
         Assert.assertEquals(permission.getPath(), PERMISSION_PATH);
         Assert.assertEquals(permission.getUrl(), PERMISSION_URL);
     }
 
+    @Test (dependsOnMethods = {"testCreatePermission"},
+            expectedExceptions = {PermissionManagementException.class},
+            expectedExceptionsMessageRegExp = "Resource URI/HTTP method is empty")
+    public void testGetPermissionError() throws PermissionManagementException {
+            Permission permission = permissionManagerService.getPermission(createErrorProperty());
+    }
+
     /**
      * Create a Property object which will be passed to getPermission method to retrieve a permission.
      * @return : Property object which contains permission url and method.
@@ -96,7 +105,18 @@ public class PermissionManagerServiceTest {
     private Properties createProperties() {
         Properties properties = new Properties();
         properties.setProperty(URL, PERMISSION_URL);
-        properties.setProperty(HTTP_METHOD, PERMiSSION_METHOD);
+        properties.setProperty(HTTP_METHOD, PERMISSION_METHOD);
+        return properties;
+    }
+
+    /**
+     * Creates property object with empty properties.
+     * @return : Properties object with empty set of properties.
+     * */
+    private Properties createErrorProperty() {
+        Properties properties = new Properties();
+        properties.setProperty(URL, "");
+        properties.setProperty(HTTP_METHOD, "");
         return properties;
     }
 }
diff --git a/pom.xml b/pom.xml
index c30878f9e14..595af103141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1532,6 +1532,12 @@
                 <version>${power.mock.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-testng</artifactId>
+                <version>${power.mock.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1961,7 +1967,7 @@
         <jacoco.maven.plugin.version>0.7.8</jacoco.maven.plugin.version>
         <jacoco.ant.verision>0.7.5.201505241946</jacoco.ant.verision>
         <ant.contrib.version>1.0b3</ant.contrib.version>
-        <power.mock.version>1.6.4</power.mock.version>
+        <power.mock.version>1.7.0</power.mock.version>
     </properties>
 
 </project>