mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Moved dependency versioning to parent pom and fixed the test failure.
This commit is contained in:
parent
52b4b46e7c
commit
ebe2a7bd6b
@ -224,14 +224,10 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.powermock</groupId>
|
<groupId>org.powermock</groupId>
|
||||||
<artifactId>powermock-module-testng</artifactId>
|
<artifactId>powermock-module-testng</artifactId>
|
||||||
<version>1.7.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.powermock</groupId>
|
<groupId>org.powermock</groupId>
|
||||||
<artifactId>powermock-api-mockito</artifactId>
|
<artifactId>powermock-api-mockito</artifactId>
|
||||||
<version>1.7.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.wso2.carbon</groupId>
|
<groupId>org.wso2.carbon</groupId>
|
||||||
|
|||||||
@ -17,7 +17,8 @@
|
|||||||
*/
|
*/
|
||||||
package org.wso2.carbon.device.mgt.core.permission.mgt;
|
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.api.mockito.PowerMockito;
|
||||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||||
import org.testng.Assert;
|
import org.testng.Assert;
|
||||||
@ -38,10 +39,10 @@ import static org.mockito.MockitoAnnotations.initMocks;
|
|||||||
public class PermissionManagerServiceTest {
|
public class PermissionManagerServiceTest {
|
||||||
|
|
||||||
private Permission permission;
|
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_URL = "permission/admin/device-mgt/test/testPermission";
|
||||||
private String PERMISSION_PATH = "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";
|
private String PERMISSION_NAME = "Test Permission";
|
||||||
|
|
||||||
//For create properties to retrieve permission.
|
//For create properties to retrieve permission.
|
||||||
@ -57,12 +58,13 @@ public class PermissionManagerServiceTest {
|
|||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public void init() throws RegistryException {
|
public void init() throws RegistryException {
|
||||||
permissionManagerService = PermissionManagerServiceImpl.getInstance();
|
|
||||||
initMocks(this);
|
initMocks(this);
|
||||||
|
log = LogFactory.getLog(PermissionManagerServiceTest.class);
|
||||||
|
permissionManagerService = PermissionManagerServiceImpl.getInstance();
|
||||||
this.permission = new Permission();
|
this.permission = new Permission();
|
||||||
permission.setName(PERMISSION_NAME);
|
permission.setName(PERMISSION_NAME);
|
||||||
permission.setPath(PERMISSION_PATH);
|
permission.setPath(PERMISSION_PATH);
|
||||||
permission.setMethod(PERMiSSION_METHOD);
|
permission.setMethod(PERMISSION_METHOD);
|
||||||
permission.setUrl(PERMISSION_URL);
|
permission.setUrl(PERMISSION_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,12 +85,19 @@ public class PermissionManagerServiceTest {
|
|||||||
public void testGetPermission() throws PermissionManagementException {
|
public void testGetPermission() throws PermissionManagementException {
|
||||||
Permission permission = permissionManagerService.getPermission(createProperties());
|
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.getName(), PERMISSION_NAME);
|
||||||
Assert.assertEquals(permission.getPath(), PERMISSION_PATH);
|
Assert.assertEquals(permission.getPath(), PERMISSION_PATH);
|
||||||
Assert.assertEquals(permission.getUrl(), PERMISSION_URL);
|
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.
|
* Create a Property object which will be passed to getPermission method to retrieve a permission.
|
||||||
* @return : Property object which contains permission url and method.
|
* @return : Property object which contains permission url and method.
|
||||||
@ -96,7 +105,18 @@ public class PermissionManagerServiceTest {
|
|||||||
private Properties createProperties() {
|
private Properties createProperties() {
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
properties.setProperty(URL, PERMISSION_URL);
|
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;
|
return properties;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@ -1532,6 +1532,12 @@
|
|||||||
<version>${power.mock.version}</version>
|
<version>${power.mock.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.powermock</groupId>
|
||||||
|
<artifactId>powermock-module-testng</artifactId>
|
||||||
|
<version>${power.mock.version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
@ -1961,7 +1967,7 @@
|
|||||||
<jacoco.maven.plugin.version>0.7.8</jacoco.maven.plugin.version>
|
<jacoco.maven.plugin.version>0.7.8</jacoco.maven.plugin.version>
|
||||||
<jacoco.ant.verision>0.7.5.201505241946</jacoco.ant.verision>
|
<jacoco.ant.verision>0.7.5.201505241946</jacoco.ant.verision>
|
||||||
<ant.contrib.version>1.0b3</ant.contrib.version>
|
<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>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user