X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-provider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fprovider%2Fimpl%2FDatabasePolicyModelsProviderTest.java;h=c188560e584de07ef2e5ce1bc8822eabcae4ade6;hb=1d59343e1c0b2077137a16f83bd0da21cdc2741f;hp=99358c4c66f5165ecd13aa1b2f96e2723463f6cb;hpb=891bffd9f13177d96ad26acdfa7148d09e1d682a;p=policy%2Fmodels.git diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java index 99358c4c6..c188560e5 100644 --- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java @@ -23,6 +23,7 @@ package org.onap.policy.models.provider.impl; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.ArrayList; @@ -66,11 +67,11 @@ public class DatabasePolicyModelsProviderTest { @Before public void setupParameters() { parameters = new PolicyModelsProviderParameters(); + parameters.setDatabaseDriver("org.h2.Driver"); parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); parameters.setDatabaseUser("policy"); parameters.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes())); parameters.setPersistenceUnit("ToscaConceptTest"); - } @Test @@ -84,27 +85,21 @@ public class DatabasePolicyModelsProviderTest { parameters.setDatabaseUrl("jdbc://www.acmecorp.nonexist"); - assertThatThrownBy(() -> { - databaseProvider.close(); - databaseProvider.init(); - }).hasMessage("could not connect to database with URL \"jdbc://www.acmecorp.nonexist\""); - - parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); - try { - databaseProvider.init(); databaseProvider.close(); + databaseProvider.init(); } catch (Exception pfme) { fail("test shold not throw an exception here"); } + databaseProvider.close(); + + parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); parameters.setPersistenceUnit("WileECoyote"); - String errorMessage = "could not create Data Access Object (DAO) using url " - + "\"jdbc:h2:mem:testdb\" and persistence unit \"WileECoyote\""; assertThatThrownBy(() -> { databaseProvider.init(); - }).hasMessage(errorMessage); + }).hasMessageContaining("could not create Data Access Object (DAO)"); parameters.setPersistenceUnit("ToscaConceptTest"); @@ -112,6 +107,7 @@ public class DatabasePolicyModelsProviderTest { databaseProvider.init(); databaseProvider.close(); } catch (Exception pfme) { + pfme.printStackTrace(); fail("test shold not throw an exception here"); } @@ -131,13 +127,6 @@ public class DatabasePolicyModelsProviderTest { } catch (Exception pfme) { fail("test shold not throw an exception here"); } - - assertThatThrownBy(() -> { - DatabasePolicyModelsProviderImpl databaseProviderImpl = (DatabasePolicyModelsProviderImpl) databaseProvider; - databaseProvider.init(); - databaseProviderImpl.setConnection(new DummyConnection()); - databaseProvider.close(); - }).hasMessage("could not close connection to database with URL \"jdbc:h2:mem:testdb\""); } @Test @@ -202,9 +191,17 @@ public class DatabasePolicyModelsProviderTest { }).hasMessage("version is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.getOperationalPolicy(null); + databaseProvider.getOperationalPolicy(null, null); }).hasMessage("policyId is marked @NonNull but is null"); + assertThatThrownBy(() -> { + databaseProvider.getOperationalPolicy(null, ""); + }).hasMessage("policyId is marked @NonNull but is null"); + + assertThatThrownBy(() -> { + databaseProvider.getOperationalPolicy("", null); + }).hasMessage("no policy found for policy: :null"); + assertThatThrownBy(() -> { databaseProvider.createOperationalPolicy(null); }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null"); @@ -214,261 +211,175 @@ public class DatabasePolicyModelsProviderTest { }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.deleteOperationalPolicy(null); + databaseProvider.deleteOperationalPolicy(null, null); }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.getGuardPolicy(null); + databaseProvider.deleteOperationalPolicy(null, ""); }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.createGuardPolicy(null); - }).hasMessage("legacyGuardPolicy is marked @NonNull but is null"); + databaseProvider.deleteOperationalPolicy("", null); + }).hasMessage("policyVersion is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updateGuardPolicy(null); - }).hasMessage("legacyGuardPolicy is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.deleteGuardPolicy(null); + databaseProvider.getGuardPolicy(null, null); }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.getFilteredPdpGroups(null); - }).hasMessage("filter is marked @NonNull but is null"); + databaseProvider.getGuardPolicy(null, ""); + }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.createPdpGroups(null); - }).hasMessage("pdpGroups is marked @NonNull but is null"); + databaseProvider.getGuardPolicy("", null); + }).hasMessage("no policy found for policy: :null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpGroups(null); - }).hasMessage("pdpGroups is marked @NonNull but is null"); + databaseProvider.createGuardPolicy(null); + }).hasMessage("legacyGuardPolicy is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup(null, null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.updateGuardPolicy(null); + }).hasMessage("legacyGuardPolicy is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup(null, null, new PdpSubGroup()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.deleteGuardPolicy(null, null); + }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup(null, "version", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.deleteGuardPolicy(null, ""); + }).hasMessage("policyId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup(null, "version", new PdpSubGroup()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.deleteGuardPolicy("", null); + }).hasMessage("policyVersion is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup("name", null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + databaseProvider.getFilteredPdpGroups(null); + }).hasMessage("filter is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup("name", null, new PdpSubGroup()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + databaseProvider.createPdpGroups(null); + }).hasMessage("pdpGroups is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpSubGroup("name", "version", null); - }).hasMessage("pdpSubGroup is marked @NonNull but is null"); + databaseProvider.updatePdpGroups(null); + }).hasMessage("pdpGroups is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, null, null, null); + databaseProvider.updatePdpSubGroup(null, null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, null, null, new Pdp()); + databaseProvider.updatePdpSubGroup(null, new PdpSubGroup()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, null, "sub", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.updatePdpSubGroup("name", null); + }).hasMessage("pdpSubGroup is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, null, "sub", new Pdp()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + databaseProvider.updatePdpSubGroup("name", new PdpSubGroup()); + }).hasMessage("parameter \"localName\" is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, "version", null, null); + databaseProvider.updatePdp(null, null, null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, "version", null, new Pdp()); + databaseProvider.updatePdp(null, null, new Pdp()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, "version", "sub", null); + databaseProvider.updatePdp(null, "sub", null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp(null, "version", "sub", new Pdp()); + databaseProvider.updatePdp(null, "sub", new Pdp()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", null, null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", null, null, new Pdp()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", null, "sub", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", null, "sub", new Pdp()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", "version", null, null); + databaseProvider.updatePdp("name", null, null); }).hasMessage("pdpSubGroup is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", "version", null, new Pdp()); + databaseProvider.updatePdp("name", null, new Pdp()); }).hasMessage("pdpSubGroup is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdp("name", "version", "sub", null); + databaseProvider.updatePdp("name", "sub", null); }).hasMessage("pdp is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.deletePdpGroup(null, null); - }).hasMessage("name is marked @NonNull but is null"); + databaseProvider.updatePdp("name", "sub", new Pdp()); + }).hasMessage("parameter \"localName\" is null"); assertThatThrownBy(() -> { - databaseProvider.deletePdpGroup(null, "version"); + databaseProvider.deletePdpGroup(null); }).hasMessage("name is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.deletePdpGroup("name", null); - }).hasMessage("version is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, null, null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, null, null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, null, "Instance", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, null, "Instance", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, "type", null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, "type", null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, "type", "Instance", null); + databaseProvider.updatePdpStatistics(null, null, null, null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, null, "type", "Instance", new PdpStatistics()); + databaseProvider.updatePdpStatistics(null, null, null, new PdpStatistics()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", null, null, null); + databaseProvider.updatePdpStatistics(null, null, "Instance", null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", null, null, new PdpStatistics()); + databaseProvider.updatePdpStatistics(null, null, "Instance", new PdpStatistics()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", null, "Instance", null); + databaseProvider.updatePdpStatistics(null, "type", null, null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", null, "Instance", new PdpStatistics()); + databaseProvider.updatePdpStatistics(null, "type", null, new PdpStatistics()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", "type", null, null); + databaseProvider.updatePdpStatistics(null, "type", "Instance", null); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", "type", null, new PdpStatistics()); + databaseProvider.updatePdpStatistics(null, "type", "Instance", new PdpStatistics()); }).hasMessage("pdpGroupName is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", "type", "Instance", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics(null, "ver", "type", "Instance", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, null, null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, null, null, new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, null, "Instance", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, null, "Instance", new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, "type", null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, "type", null, new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, "type", "Instance", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", null, "type", "Instance", new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", null, null, null); + databaseProvider.updatePdpStatistics("name", null, null, null); }).hasMessage("pdpType is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", null, null, new PdpStatistics()); + databaseProvider.updatePdpStatistics("name", null, null, new PdpStatistics()); }).hasMessage("pdpType is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", null, "Instance", null); + databaseProvider.updatePdpStatistics("name", null, "Instance", null); }).hasMessage("pdpType is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", null, "Instance", new PdpStatistics()); + databaseProvider.updatePdpStatistics("name", null, "Instance", new PdpStatistics()); }).hasMessage("pdpType is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", "type", null, null); + databaseProvider.updatePdpStatistics("name", "type", null, null); }).hasMessage("pdpInstanceId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", "type", null, new PdpStatistics()); + databaseProvider.updatePdpStatistics("name", "type", null, new PdpStatistics()); }).hasMessage("pdpInstanceId is marked @NonNull but is null"); assertThatThrownBy(() -> { - databaseProvider.updatePdpStatistics("name", "ver", "type", "Instance", null); + databaseProvider.updatePdpStatistics("name", "type", "Instance", null); }).hasMessage("pdpStatistics is marked @NonNull but is null"); + databaseProvider.updatePdpStatistics("name", "type", "Instance", new PdpStatistics()); + databaseProvider.close(); } @@ -489,10 +400,10 @@ public class DatabasePolicyModelsProviderTest { try (PolicyModelsProvider databaseProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) { - assertEquals(0, databaseProvider.getPolicyTypes("name", "version").getPolicyTypes().get(0).size()); - assertEquals(0, databaseProvider.getPolicyTypeList("name", "version").size()); + assertTrue(databaseProvider.getPolicyTypes("name", "1.0.0").getPolicyTypes().isEmpty()); + assertEquals(0, databaseProvider.getPolicyTypeList("name", "1.0.0").size()); assertEquals(0, databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build()) - .getPolicyTypes().get(0).size()); + .getPolicyTypes().size()); assertEquals(0, databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).size()); assertThatThrownBy(() -> { @@ -503,15 +414,15 @@ public class DatabasePolicyModelsProviderTest { databaseProvider.updatePolicyTypes(new ToscaServiceTemplate()); }).hasMessage("no policy types specified on service template"); - assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size()); + assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty()); - assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size()); + assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty()); - assertEquals(0, databaseProvider.getPolicies("name", "version").getToscaTopologyTemplate().getPolicies() - .get(0).size()); - assertEquals(0, databaseProvider.getPolicyList("name", "version").size()); + assertTrue( + databaseProvider.getPolicies("name", "1.0.0").getToscaTopologyTemplate().getPolicies().isEmpty()); + assertEquals(0, databaseProvider.getPolicyList("name", "1.0.0").size()); assertEquals(0, databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build()) - .getToscaTopologyTemplate().getPolicies().get(0).size()); + .getToscaTopologyTemplate().getPolicies().size()); assertEquals(0, databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).size()); assertThatThrownBy(() -> { @@ -522,12 +433,16 @@ public class DatabasePolicyModelsProviderTest { databaseProvider.updatePolicies(new ToscaServiceTemplate()); }).hasMessage("topology template not specified on service template"); - assertEquals(0, databaseProvider.deletePolicy("Policy", "0.0.0").getToscaTopologyTemplate().getPolicies() - .get(0).size()); + assertTrue(databaseProvider.deletePolicy("Policy", "0.0.0").getToscaTopologyTemplate().getPolicies() + .isEmpty()); + + assertThatThrownBy(() -> { + databaseProvider.getOperationalPolicy("policy_id", null); + }).hasMessage("no policy found for policy: policy_id:null"); assertThatThrownBy(() -> { - databaseProvider.getOperationalPolicy("policy_id"); - }).hasMessage("no policy found for policy ID: policy_id"); + databaseProvider.getOperationalPolicy("policy_id", "10"); + }).hasMessage("no policy found for policy: policy_id:10"); assertThatThrownBy(() -> { databaseProvider.createOperationalPolicy(new LegacyOperationalPolicy()); @@ -535,15 +450,19 @@ public class DatabasePolicyModelsProviderTest { assertThatThrownBy(() -> { databaseProvider.updateOperationalPolicy(new LegacyOperationalPolicy()); - }).hasMessage("no policy found for policy ID: null"); + }).hasMessage("name is marked @NonNull but is null"); + + assertThatThrownBy(() -> { + databaseProvider.deleteOperationalPolicy("policy_id", "55"); + }).hasMessage("no policy found for policy: policy_id:55"); assertThatThrownBy(() -> { - databaseProvider.deleteOperationalPolicy("policy_id"); - }).hasMessage("no policy found for policy ID: policy_id"); + databaseProvider.getGuardPolicy("policy_id", null); + }).hasMessage("no policy found for policy: policy_id:null"); assertThatThrownBy(() -> { - databaseProvider.getGuardPolicy("policy_id"); - }).hasMessage("no policy found for policy ID: policy_id"); + databaseProvider.getGuardPolicy("policy_id", "6"); + }).hasMessage("no policy found for policy: policy_id:6"); assertThatThrownBy(() -> { databaseProvider.createGuardPolicy(new LegacyGuardPolicyInput()); @@ -554,10 +473,10 @@ public class DatabasePolicyModelsProviderTest { }).hasMessage("policy type for guard policy \"null\" unknown"); assertThatThrownBy(() -> { - databaseProvider.deleteGuardPolicy("policy_id"); - }).hasMessage("no policy found for policy ID: policy_id"); + databaseProvider.deleteGuardPolicy("policy_id", "33"); + }).hasMessage("no policy found for policy: policy_id:33"); - assertEquals(0, databaseProvider.getPdpGroups("name", "version").size()); + assertEquals(0, databaseProvider.getPdpGroups("name").size()); assertEquals(0, databaseProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).size()); assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>())); @@ -588,29 +507,29 @@ public class DatabasePolicyModelsProviderTest { assertEquals(123, databaseProvider.createPdpGroups(groupList).get(0).getPdpSubgroups().get(0) .getDesiredInstanceCount()); - assertEquals(1, databaseProvider.getPdpGroups("group", "1.2.3").size()); + assertEquals(1, databaseProvider.getPdpGroups("group").size()); pdpSubGroup.setDesiredInstanceCount(234); - databaseProvider.updatePdpSubGroup("group", "1.2.3", pdpSubGroup); - assertEquals(234, databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups() - .get(0).getDesiredInstanceCount()); + databaseProvider.updatePdpSubGroup("group", pdpSubGroup); + assertEquals(234, + databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0).getDesiredInstanceCount()); - assertEquals("Hello", databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups() - .get(0).getPdpInstances().get(0).getMessage()); + assertEquals("Hello", databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0) + .getPdpInstances().get(0).getMessage()); pdp.setMessage("Howdy"); - databaseProvider.updatePdp("group", "1.2.3", "type", pdp); - assertEquals("Howdy", databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups() - .get(0).getPdpInstances().get(0).getMessage()); + databaseProvider.updatePdp("group", "type", pdp); + assertEquals("Howdy", databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0) + .getPdpInstances().get(0).getMessage()); assertThatThrownBy(() -> { - databaseProvider.deletePdpGroup("name", "version"); - }).hasMessage("delete of PDP group \"name:version\" failed, PDP group does not exist"); + databaseProvider.deletePdpGroup("name"); + }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist"); - assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup("group", "1.2.3").getName()); + assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup("group").getName()); - assertEquals(0, databaseProvider.getPdpStatistics(null, null).size()); + assertEquals(0, databaseProvider.getPdpStatistics(null).size()); - databaseProvider.updatePdpStatistics("group", "1.2.3", "type", "type-0", new PdpStatistics()); + databaseProvider.updatePdpStatistics("group", "type", "type-0", new PdpStatistics()); } catch (Exception exc) { LOGGER.warn("test should not throw an exception", exc); fail("test should not throw an exception");