improve some exsiting testcase to increase coverage and new testcase

revert-70aa11f8
Jasintha 7 years ago
parent 3a298be073
commit 7eff68b807

@ -150,13 +150,9 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
} }
} catch (PolicyEvaluationException e) { } catch (PolicyEvaluationException e) {
String msg; String msg = "Error occurred while getting the effective features from the PEP service " +
if(deviceIdentifier != null) {
msg = "Error occurred while getting the effective features from the PEP service " +
deviceIdentifier.getId() + " - " + deviceIdentifier.getType(); deviceIdentifier.getId() + " - " + deviceIdentifier.getType();
}else {
msg = "Null deviceIdentifier object is passed to the method";
}
log.error(msg, e); log.error(msg, e);
throw new FeatureManagementException(msg, e); throw new FeatureManagementException(msg, e);
} }

@ -40,6 +40,7 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
import org.wso2.carbon.device.mgt.common.policy.mgt.Profile; import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature; import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature; import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException; import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl; import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
@ -84,6 +85,8 @@ public class PolicyManagerServiceImplTest extends BasePolicyManagementDAOTest {
private static final String POLICY1 = "policy1"; private static final String POLICY1 = "policy1";
private static final String POLICY1_FEATURE1_CODE = "DISALLOW_ADJUST_VOLUME"; private static final String POLICY1_FEATURE1_CODE = "DISALLOW_ADJUST_VOLUME";
private static final String ADMIN_USER = "admin"; private static final String ADMIN_USER = "admin";
public static final String DEVICE_2 = "device2";
public static final String DEVICE_TYPE_B = "deviceTypeB";
private DeviceManagementProviderService deviceMgtService; private DeviceManagementProviderService deviceMgtService;
private GroupManagementProviderService groupMgtService; private GroupManagementProviderService groupMgtService;
@ -309,8 +312,11 @@ public class PolicyManagerServiceImplTest extends BasePolicyManagementDAOTest {
complianceFeatures.add(complianceFeature); complianceFeatures.add(complianceFeature);
policyManagerService.checkCompliance(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A), complianceFeatures); policyManagerService.checkCompliance(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A), complianceFeatures);
boolean deviceCompliance = policyManagerService.isCompliant(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A)); boolean deviceCompliance = policyManagerService.isCompliant(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A));
Assert.assertFalse(deviceCompliance, "Policy was compliant even though the response was not compliant"); Assert.assertFalse(deviceCompliance, "Policy was compliant even though the response was not compliant");
List<ComplianceFeature> complianceFeatureList = policyManagerService.
checkPolicyCompliance(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A), complianceFeatures);
Assert.assertNotNull(complianceFeature);
Assert.assertEquals(POLICY1_FEATURE1_CODE,complianceFeatureList.get(0).getFeatureCode());
} }
@Test(dependsOnMethods = "inactivatePolicy") @Test(dependsOnMethods = "inactivatePolicy")
@ -352,12 +358,18 @@ public class PolicyManagerServiceImplTest extends BasePolicyManagementDAOTest {
Assert.assertNotNull(effectiveFeatures); Assert.assertNotNull(effectiveFeatures);
Assert.assertEquals(POLICY1_FEATURE1_CODE,effectiveFeatures.get(0).getFeatureCode()); Assert.assertEquals(POLICY1_FEATURE1_CODE,effectiveFeatures.get(0).getFeatureCode());
try{ try{
policyManagerService.getEffectiveFeatures(null); policyManagerService.getEffectiveFeatures(new DeviceIdentifier(DEVICE_2, DEVICE_TYPE_B));
}catch(FeatureManagementException e){ }catch(FeatureManagementException e){
Assert.assertTrue(e.getCause()instanceof PolicyEvaluationException); Assert.assertTrue(e.getCause()instanceof PolicyEvaluationException);
} }
} }
@Test(dependsOnMethods = "applyPolicy")
public void getDeviceCompliance() throws Exception{
NonComplianceData deviceCompliance = policyManagerService.getDeviceCompliance(new DeviceIdentifier(DEVICE1, DEVICE_TYPE_A));
Assert.assertNotNull(deviceCompliance);
}
} }

@ -36,6 +36,7 @@ public class
SimplePolicyEvaluationTest implements PolicyEvaluationPoint { SimplePolicyEvaluationTest implements PolicyEvaluationPoint {
private static final Log log = LogFactory.getLog(SimplePolicyEvaluationTest.class); private static final Log log = LogFactory.getLog(SimplePolicyEvaluationTest.class);
public static final String DEVICE2 = "device2"; // assuming this device does not have valid policy
@Override @Override
public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException { public Policy getEffectivePolicy(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException {
@ -77,10 +78,11 @@ SimplePolicyEvaluationTest implements PolicyEvaluationPoint {
@Override @Override
public List<ProfileFeature> getEffectiveFeatures(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException { public List<ProfileFeature> getEffectiveFeatures(DeviceIdentifier deviceIdentifier) throws PolicyEvaluationException {
if(deviceIdentifier!=null) { if(DEVICE2.equals(deviceIdentifier.getId())) {
return getEffectivePolicy(deviceIdentifier).getProfile().getProfileFeaturesList();
}else {
throw new PolicyEvaluationException(); throw new PolicyEvaluationException();
}else {
return getEffectivePolicy(deviceIdentifier).getProfile().getProfileFeaturesList();
} }
} }

Loading…
Cancel
Save