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 @@
org.powermock
powermock-module-testng
- 1.7.0
- test
org.powermock
powermock-api-mockito
- 1.7.0
- test
org.wso2.carbon
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 @@
${power.mock.version}
test
+
+ org.powermock
+ powermock-module-testng
+ ${power.mock.version}
+ test
+
@@ -1961,7 +1967,7 @@
0.7.8
0.7.5.201505241946
1.0b3
- 1.6.4
+ 1.7.0