X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2Fprovider%2FTestPolicyProvider.java;h=f458013d1fa9ff082fdfd0a082d47546e8723b11;hb=5949dbc9b1a3648a9d9f4046e565d0ca8be9149a;hp=be9b5838b825cd1237d331b4318857fd50e2473f;hpb=26df4c98fb4f1467a405608f761100575bbc34f8;p=policy%2Fapi.git diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java index be9b5838..f458013d 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.Base64; import java.util.Collections; import java.util.List; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -158,11 +157,6 @@ public class TestPolicyProvider { String policyTypeVersion = "1.0.0"; String policyTypeId = "onap.policies.monitoring.cdap.tca.hi.lo.app"; - // Basic Exception Throw - assertThatThrownBy(() -> { - policyProvider.fetchDeployedPolicies("dummy", "1.0.0", "dummy"); - }).hasMessage("could not find policy with ID dummy and type dummy:1.0.0 deployed in any pdp group"); - try (PolicyModelsProvider databaseProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(providerParams)) { assertEquals(0, databaseProvider.getPdpGroups("name").size()); @@ -216,23 +210,12 @@ public class TestPolicyProvider { assertFalse(serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).isEmpty()); }).doesNotThrowAnyException(); - // Test fetchDeployedPolicies (deployedPolicyMap.isEmpty())==true - assertThatThrownBy(() -> { - policyProvider.fetchDeployedPolicies(policyTypeId, policyTypeVersion, policyId); - }).hasMessage("could not find policy with ID " + policyId + " and type " + policyTypeId + ":" - + policyTypeVersion + " deployed in any pdp group"); - // Update pdpSubGroup pdpSubGroup.setPolicies(new ArrayList<>()); pdpSubGroup.getPolicies().add(new ToscaPolicyIdentifier(policyId, policyVersion)); assertEquals(1, databaseProvider.createPdpGroups(groupList).get(0).getPdpSubgroups().get(0).getPolicies().size()); - // Test fetchDeployedPolicies - assertThatCode(() -> { - policyProvider.fetchDeployedPolicies(policyTypeId, policyTypeVersion, policyId); - }).doesNotThrowAnyException(); - // Test validateDeleteEligibility exception path(!pdpGroups.isEmpty()) assertThatThrownBy(() -> { policyProvider.deletePolicy("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0", "onap.restart.tca",