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=388b6ad98d9617cd3813c283531461328f2fbac3;hb=172b8dcd3a772c03ec1d233cfd6602d901c61b99;hp=565b3fe134d078fa2b405345190b0c45bea92f2c;hpb=10c11e142feb1d040612fed695aaf76d007294da;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 565b3fe13..388b6ad98 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
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +25,15 @@ 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;
 import java.util.Base64;
+import java.util.Date;
 import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.pdp.concepts.Pdp;
 import org.onap.policy.models.pdp.concepts.PdpGroup;
 import org.onap.policy.models.pdp.concepts.PdpGroupFilter;
@@ -43,13 +45,11 @@ import org.onap.policy.models.provider.PolicyModelsProvider;
 import org.onap.policy.models.provider.PolicyModelsProviderFactory;
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyFilter;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeFilter;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
-import org.onap.policy.models.tosca.legacy.concepts.LegacyGuardPolicyInput;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test the database models provider implementation.
@@ -57,7 +57,29 @@ import org.slf4j.LoggerFactory;
  * @author Liam Fallon (liam.fallon@est.tech)
  */
 public class DatabasePolicyModelsProviderTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DatabasePolicyModelsProviderTest.class);
+    private static final String NAME = "name";
+
+    private static final String TEMPLATE_IS_NULL = "^serviceTemplate is marked .*on.*ull but is null$";
+
+    private static final String POLICY_ID_IS_NULL = "^policyId is marked .*on.*ull but is null$";
+
+    private static final String SUBGROUP_IS_NULL = "^pdpSubGroup is marked .*on.*ull but is null$";
+
+    private static final String GROUP_IS_NULL = "^pdpGroupName is marked .*on.*ull but is null$";
+
+    private static final String NAME_IS_NULL = "^name is marked .*on.*ull but is null$";
+
+    private static final String FILTER_IS_NULL = "^filter is marked .*on.*ull but is null$";
+
+    private static final String POLICY_ID = "policy_id";
+
+    private static final String GROUP = "group";
+
+    private static final String VERSION_100 = "1.0.0";
+
+    private static final Date TIMESTAMP = new Date();
+
+    private static final String ORDER = "DESC";
 
     PolicyModelsProviderParameters parameters;
 
@@ -78,125 +100,108 @@ public class DatabasePolicyModelsProviderTest {
     public void testInitAndClose() throws Exception {
         assertThatThrownBy(() -> {
             new DatabasePolicyModelsProviderImpl(null);
-        }).hasMessage("parameters is marked @NonNull but is null");
+        }).hasMessageMatching("^parameters is marked .*on.*ull but is null$");
 
         PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
 
         parameters.setDatabaseUrl("jdbc://www.acmecorp.nonexist");
 
-        try {
-            databaseProvider.close();
-            databaseProvider.init();
-        } catch (Exception pfme) {
-            fail("test shold not throw an exception here");
-        }
+        databaseProvider.close();
+        databaseProvider.init();
+
         databaseProvider.close();
 
         parameters.setDatabaseUrl("jdbc:h2:mem:testdb");
 
         parameters.setPersistenceUnit("WileECoyote");
 
-        assertThatThrownBy(() -> {
-            databaseProvider.init();
-        }).hasMessageContaining("could not create Data Access Object (DAO)");
+        assertThatThrownBy(databaseProvider::init).hasMessageContaining("could not create Data Access Object (DAO)");
 
         parameters.setPersistenceUnit("ToscaConceptTest");
 
-        try {
-            databaseProvider.init();
-            databaseProvider.close();
-        } catch (Exception pfme) {
-            pfme.printStackTrace();
-            fail("test shold not throw an exception here");
-        }
+        databaseProvider.init();
+        databaseProvider.close();
 
         assertThatThrownBy(() -> {
             databaseProvider.init();
             databaseProvider.init();
         }).hasMessage("provider is already initialized");
 
-        try {
-            databaseProvider.close();
-        } catch (Exception pfme) {
-            fail("test shold not throw an exception here");
-        }
-
-        try {
-            databaseProvider.close();
-        } catch (Exception pfme) {
-            fail("test shold not throw an exception here");
-        }
+        databaseProvider.close();
+
+        databaseProvider.close();
     }
 
     @Test
     public void testProviderMethodsNull() throws Exception {
+
         PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
 
         assertThatThrownBy(() -> {
             databaseProvider.getFilteredPolicyTypes(null);
-        }).hasMessage("filter is marked @NonNull but is null");
+        }).hasMessageMatching(FILTER_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.getFilteredPolicyTypeList(null);
-        }).hasMessage("filter is marked @NonNull but is null");
+        }).hasMessageMatching(FILTER_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.createPolicyTypes(null);
-        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        }).hasMessageMatching(TEMPLATE_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePolicyTypes(null);
-        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        }).hasMessageMatching(TEMPLATE_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicyType(null, null);
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicyType("aaa", null);
-        }).hasMessage("version is marked @NonNull but is null");
+        }).hasMessageMatching("^version is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicyType(null, "aaa");
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.getFilteredPolicies(null);
-        }).hasMessage("filter is marked @NonNull but is null");
+        }).hasMessageMatching(FILTER_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.getFilteredPolicyList(null);
-        }).hasMessage("filter is marked @NonNull but is null");
+        }).hasMessageMatching(FILTER_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.createPolicies(null);
-        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        }).hasMessageMatching(TEMPLATE_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePolicies(null);
-        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        }).hasMessageMatching(TEMPLATE_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicy(null, null);
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicy(null, "aaa");
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePolicy("aaa", null);
-        }).hasMessage("version is marked @NonNull but is null");
+        }).hasMessageMatching("^version is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.getOperationalPolicy(null, null);
-        }).hasMessage("policyId is marked @NonNull but is null");
+        }).hasMessageMatching(POLICY_ID_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.getOperationalPolicy(null, "");
-        }).hasMessage("policyId is marked @NonNull but is null");
+        }).hasMessageMatching(POLICY_ID_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.getOperationalPolicy("", null);
@@ -204,335 +209,354 @@ public class DatabasePolicyModelsProviderTest {
 
         assertThatThrownBy(() -> {
             databaseProvider.createOperationalPolicy(null);
-        }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
+        }).hasMessageMatching("^legacyOperationalPolicy is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.updateOperationalPolicy(null);
-        }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
+        }).hasMessageMatching("^legacyOperationalPolicy is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.deleteOperationalPolicy(null, null);
-        }).hasMessage("policyId is marked @NonNull but is null");
+        }).hasMessageMatching(POLICY_ID_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deleteOperationalPolicy(null, "");
-        }).hasMessage("policyId is marked @NonNull but is null");
+        }).hasMessageMatching(POLICY_ID_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.deleteOperationalPolicy("", null);
-        }).hasMessage("policyVersion is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.getGuardPolicy(null, null);
-        }).hasMessage("policyId is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.getGuardPolicy(null, "");
-        }).hasMessage("policyId is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.getGuardPolicy("", null);
-        }).hasMessage("no policy found for policy: :null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.createGuardPolicy(null);
-        }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.updateGuardPolicy(null);
-        }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.deleteGuardPolicy(null, null);
-        }).hasMessage("policyId is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.deleteGuardPolicy(null, "");
-        }).hasMessage("policyId is marked @NonNull but is null");
-
-        assertThatThrownBy(() -> {
-            databaseProvider.deleteGuardPolicy("", null);
-        }).hasMessage("policyVersion is marked @NonNull but is null");
+        }).hasMessageMatching("^policyVersion is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.getFilteredPdpGroups(null);
-        }).hasMessage("filter is marked @NonNull but is null");
+        }).hasMessageMatching(FILTER_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.createPdpGroups(null);
-        }).hasMessage("pdpGroups is marked @NonNull but is null");
+        }).hasMessageMatching("^pdpGroups is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdpGroups(null);
-        }).hasMessage("pdpGroups is marked @NonNull but is null");
+        }).hasMessageMatching("^pdpGroups is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdpSubGroup(null, null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdpSubGroup(null, new PdpSubGroup());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpSubGroup("name", null);
-        }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+            databaseProvider.updatePdpSubGroup(NAME, null);
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpSubGroup("name", new PdpSubGroup());
+            databaseProvider.updatePdpSubGroup(NAME, new PdpSubGroup());
         }).hasMessage("parameter \"localName\" is null");
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdp(null, null, null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdp(null, null, new Pdp());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdp(null, "sub", null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             databaseProvider.updatePdp(null, "sub", new Pdp());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdp("name", null, null);
-        }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+            databaseProvider.updatePdp(NAME, null, null);
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdp("name", null, new Pdp());
-        }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+            databaseProvider.updatePdp(NAME, null, new Pdp());
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdp("name", "sub", null);
-        }).hasMessage("pdp is marked @NonNull but is null");
+            databaseProvider.updatePdp(NAME, "sub", null);
+        }).hasMessageMatching("^pdp is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdp("name", "sub", new Pdp());
+            databaseProvider.updatePdp(NAME, "sub", new Pdp());
         }).hasMessage("parameter \"localName\" is null");
 
         assertThatThrownBy(() -> {
             databaseProvider.deletePdpGroup(null);
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, null, null, null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.getFilteredPdpStatistics(NAME, null, "sub", TIMESTAMP, TIMESTAMP, ORDER, 0);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, null, null, new PdpStatistics());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.createPdpStatistics(null);
+        }).hasMessageMatching("^pdpStatisticsList is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, null, "Instance", null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.updatePdpStatistics(null);
+        }).hasMessageMatching("^pdpStatisticsList is marked .*on.*ull but is null$");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, null, "Instance", new PdpStatistics());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.deletePdpStatistics(null, TIMESTAMP);
+        }).hasMessageMatching(NAME_IS_NULL);
+
+        databaseProvider.close();
+    }
+
+    @Test
+    public void testProviderMethodsNotInit() throws Exception {
+        PolicyModelsProvider databaseProvider =
+                new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+
+        databaseProvider.close();
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, "type", null, null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.getPolicyTypes(NAME, "version");
+        }).hasMessage("policy models provider is not initilaized");
+    }
+
+    @Test
+    public void testProviderMethods() throws PfModelException {
+        PolicyModelsProvider databaseProvider =
+                new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+
+        assertThatThrownBy(() -> databaseProvider.getPolicyTypes(NAME, VERSION_100))
+                .hasMessage("service template not found in database");
+
+        assertTrue(databaseProvider.getPolicyTypeList(NAME, VERSION_100).isEmpty());
+
+        assertThatThrownBy(() -> databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build()))
+                .hasMessage("service template not found in database");
+
+        assertTrue(databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).isEmpty());
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, "type", null, new PdpStatistics());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.createPolicyTypes(new ToscaServiceTemplate());
+        }).hasMessage("no policy types specified on service template");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, "type", "Instance", null);
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.updatePolicyTypes(new ToscaServiceTemplate());
+        }).hasMessage("no policy types specified on service template");
+
+        assertThatThrownBy(() -> databaseProvider.deletePolicyType(NAME, VERSION_100))
+                .hasMessage("service template not found in database");
+
+        assertThatThrownBy(() -> databaseProvider.getPolicies(NAME, VERSION_100))
+                .hasMessage("service template not found in database");
+
+        assertTrue(databaseProvider.getPolicyList(NAME, VERSION_100).isEmpty());
+
+        assertThatThrownBy(() -> databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build()))
+                .hasMessage("service template not found in database");
+
+        assertTrue(databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).isEmpty());
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics(null, "type", "Instance", new PdpStatistics());
-        }).hasMessage("pdpGroupName is marked @NonNull but is null");
+            databaseProvider.createPolicies(new ToscaServiceTemplate());
+        }).hasMessage("topology template not specified on service template");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", null, null, null);
-        }).hasMessage("pdpType is marked @NonNull but is null");
+            databaseProvider.updatePolicies(new ToscaServiceTemplate());
+        }).hasMessage("topology template not specified on service template");
+
+        assertThatThrownBy(() -> databaseProvider.deletePolicy("Policy", "0.0.0").getToscaTopologyTemplate())
+                .hasMessage("service template not found in database");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", null, null, new PdpStatistics());
-        }).hasMessage("pdpType is marked @NonNull but is null");
+            databaseProvider.getOperationalPolicy(POLICY_ID, null);
+        }).hasMessage("no policy found for policy: policy_id:null");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", null, "Instance", null);
-        }).hasMessage("pdpType is marked @NonNull but is null");
+            databaseProvider.getOperationalPolicy(POLICY_ID, "10");
+        }).hasMessage("no policy found for policy: policy_id:10");
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", null, "Instance", new PdpStatistics());
-        }).hasMessage("pdpType is marked @NonNull but is null");
+            databaseProvider.createOperationalPolicy(new LegacyOperationalPolicy());
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", "type", null, null);
-        }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+            databaseProvider.updateOperationalPolicy(new LegacyOperationalPolicy());
+        }).hasMessageMatching(NAME_IS_NULL);
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", "type", null, new PdpStatistics());
-        }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+            databaseProvider.deleteOperationalPolicy(POLICY_ID, "55");
+        }).hasMessage("no policy found for policy: policy_id:55");
+
+        assertEquals(0, databaseProvider.getPdpGroups(NAME).size());
+        assertEquals(0, databaseProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).size());
+
+        assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>()));
+        assertNotNull(databaseProvider.updatePdpGroups(new ArrayList<>()));
+
+        PdpGroup pdpGroup = new PdpGroup();
+        pdpGroup.setName(GROUP);
+        pdpGroup.setVersion("1.2.3");
+        pdpGroup.setPdpGroupState(PdpState.ACTIVE);
+        pdpGroup.setPdpSubgroups(new ArrayList<>());
+        List<PdpGroup> groupList = new ArrayList<>();
+        groupList.add(pdpGroup);
+
+        PdpSubGroup pdpSubGroup = new PdpSubGroup();
+        pdpSubGroup.setPdpType("type");
+        pdpSubGroup.setDesiredInstanceCount(123);
+        pdpSubGroup.setSupportedPolicyTypes(new ArrayList<>());
+        pdpSubGroup.getSupportedPolicyTypes().add(new ToscaPolicyTypeIdentifier("type", "7.8.9"));
+        pdpGroup.getPdpSubgroups().add(pdpSubGroup);
+
+        Pdp pdp = new Pdp();
+        pdp.setInstanceId("type-0");
+        pdp.setMessage("Hello");
+        pdp.setPdpState(PdpState.ACTIVE);
+        pdp.setHealthy(PdpHealthStatus.UNKNOWN);
+        pdpSubGroup.setPdpInstances(new ArrayList<>());
+        pdpSubGroup.getPdpInstances().add(pdp);
+
+        PdpStatistics pdpStatistics = new PdpStatistics();
+        pdpStatistics.setPdpInstanceId(NAME);
+        pdpStatistics.setTimeStamp(new Date());
+        pdpStatistics.setPdpGroupName(GROUP);
+        pdpStatistics.setPdpSubGroupName("type");
+        ArrayList<PdpStatistics> statisticsArrayList = new ArrayList<>();
+        statisticsArrayList.add(pdpStatistics);
+
+        assertEquals(123,
+                databaseProvider.createPdpGroups(groupList).get(0).getPdpSubgroups().get(0).getDesiredInstanceCount());
+        assertEquals(1, databaseProvider.getPdpGroups(GROUP).size());
+
+        pdpSubGroup.setDesiredInstanceCount(234);
+        databaseProvider.updatePdpSubGroup(GROUP, pdpSubGroup);
+        assertEquals(234,
+                databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getDesiredInstanceCount());
+
+        assertEquals("Hello", databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getPdpInstances()
+                .get(0).getMessage());
+        pdp.setMessage("Howdy");
+        databaseProvider.updatePdp(GROUP, "type", pdp);
+        assertEquals("Howdy", databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getPdpInstances()
+                .get(0).getMessage());
 
         assertThatThrownBy(() -> {
-            databaseProvider.updatePdpStatistics("name", "type", "Instance", null);
-        }).hasMessage("pdpStatistics is marked @NonNull but is null");
+            databaseProvider.deletePdpGroup(NAME);
+        }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist");
+
+        assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup(GROUP).getName());
+
+        assertEquals(0, databaseProvider.getPdpStatistics(null, null).size());
+        assertEquals(1, databaseProvider.createPdpStatistics(statisticsArrayList).size());
+        assertEquals(1, databaseProvider.updatePdpStatistics(statisticsArrayList).size());
+
+        assertEquals(NAME, databaseProvider.getPdpStatistics(null, null).get(0).getPdpInstanceId());
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(null, GROUP, null, null, null, ORDER, 0).get(0)
+                .getPdpInstanceId());
+        assertEquals(0,
+                databaseProvider.getFilteredPdpStatistics(null, GROUP, null, new Date(), null, ORDER, 0).size());
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(null, GROUP, null, null, new Date(), ORDER, 0)
+                .get(0).getPdpInstanceId());
+        assertEquals(0,
+                databaseProvider.getFilteredPdpStatistics(null, GROUP, null, new Date(), new Date(), ORDER, 0).size());
+
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, null, null, null, ORDER, 0).get(0)
+                .getPdpInstanceId());
+        assertEquals(0,
+                databaseProvider.getFilteredPdpStatistics(NAME, GROUP, null, new Date(), new Date(), ORDER, 0).size());
+
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 0).get(0)
+                .getPdpInstanceId());
+        assertEquals(0, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", new Date(), new Date(), ORDER, 0)
+                .size());
 
-        databaseProvider.updatePdpStatistics("name", "type", "Instance", new PdpStatistics());
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 1).get(0)
+                .getPdpInstanceId());
+        assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 5).get(0)
+                .getPdpInstanceId());
+        assertEquals(0, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", new Date(), new Date(), ORDER, 5)
+                .size());
+
+        assertEquals(NAME, databaseProvider.deletePdpStatistics(NAME, null).get(0).getPdpInstanceId());
+        assertEquals(0, databaseProvider.getPdpStatistics(null, null).size());
 
         databaseProvider.close();
     }
 
     @Test
-    public void testProviderMethodsNotInit() throws Exception {
+    public void testDeletePolicyDeployedInSubgroup() throws PfModelException {
+        List<ToscaPolicyIdentifier> policies = new ArrayList<>();
+
+        policies.add(new ToscaPolicyIdentifier("p0", "0.0.1"));
+        policies.add(new ToscaPolicyIdentifier("p1", "0.0.1"));
+
+        List<ToscaPolicyTypeIdentifier> supportedPolicyTypes = new ArrayList<>();
+        supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier("pt2", "0.0.1"));
+
+        PdpSubGroup subGroup = new PdpSubGroup();
+        subGroup.setPdpType("pdpType");
+        subGroup.setSupportedPolicyTypes(supportedPolicyTypes);
+        subGroup.setPolicies(policies);
+
+        List<PdpSubGroup> pdpSubgroups = new ArrayList<>();
+        pdpSubgroups.add(subGroup);
+
+        PdpGroup pdpGroup = new PdpGroup();
+        pdpGroup.setName("pdpGroup");
+        pdpGroup.setPdpGroupState(PdpState.PASSIVE);
+        pdpGroup.setPdpSubgroups(pdpSubgroups);
+
+        List<PdpGroup> pdpGroups = new ArrayList<>();
+        pdpGroups.add(pdpGroup);
+
         PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
 
-        databaseProvider.close();
+        databaseProvider.createPdpGroups(pdpGroups);
 
-        assertThatThrownBy(() -> {
-            databaseProvider.getPolicyTypes("name", "version");
-        }).hasMessage("policy models provider is not initilaized");
+        assertThatThrownBy(() -> databaseProvider.deletePolicy("p0", "0.0.1"))
+                .hasMessageContaining("policy is in use, it is deployed in PDP group pdpGroup subgroup pdpType");
+
+        assertThatThrownBy(() -> databaseProvider.deletePolicy("p3", "0.0.1"))
+                .hasMessageContaining("service template not found in database");
+
+        databaseProvider.close();
     }
 
     @Test
-    public void testProviderMethods() {
-        try (PolicyModelsProvider databaseProvider =
-                new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
-
-            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());
-            assertEquals(0, databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).size());
-
-            assertThatThrownBy(() -> {
-                databaseProvider.createPolicyTypes(new ToscaServiceTemplate());
-            }).hasMessage("no policy types specified on service template");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.updatePolicyTypes(new ToscaServiceTemplate());
-            }).hasMessage("no policy types specified on service template");
-
-            assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty());
-
-            assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty());
-
-            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());
-            assertEquals(0, databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).size());
-
-            assertThatThrownBy(() -> {
-                databaseProvider.createPolicies(new ToscaServiceTemplate());
-            }).hasMessage("topology template not specified on service template");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.updatePolicies(new ToscaServiceTemplate());
-            }).hasMessage("topology template not specified on service template");
-
-            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", "10");
-            }).hasMessage("no policy found for policy: policy_id:10");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.createOperationalPolicy(new LegacyOperationalPolicy());
-            }).hasMessage("name is marked @NonNull but is null");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.updateOperationalPolicy(new LegacyOperationalPolicy());
-            }).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.getGuardPolicy("policy_id", null);
-            }).hasMessage("no policy found for policy: policy_id:null");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.getGuardPolicy("policy_id", "6");
-            }).hasMessage("no policy found for policy: policy_id:6");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.createGuardPolicy(new LegacyGuardPolicyInput());
-            }).hasMessage("policy type for guard policy \"null\" unknown");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.updateGuardPolicy(new LegacyGuardPolicyInput());
-            }).hasMessage("policy type for guard policy \"null\" unknown");
-
-            assertThatThrownBy(() -> {
-                databaseProvider.deleteGuardPolicy("policy_id", "33");
-            }).hasMessage("no policy found for policy: policy_id:33");
-
-            assertEquals(0, databaseProvider.getPdpGroups("name").size());
-            assertEquals(0, databaseProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).size());
-
-            assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>()));
-            assertNotNull(databaseProvider.updatePdpGroups(new ArrayList<>()));
-
-            PdpGroup pdpGroup = new PdpGroup();
-            pdpGroup.setName("group");
-            pdpGroup.setVersion("1.2.3");
-            pdpGroup.setPdpGroupState(PdpState.ACTIVE);
-            pdpGroup.setPdpSubgroups(new ArrayList<>());
-            List<PdpGroup> groupList = new ArrayList<>();
-            groupList.add(pdpGroup);
-
-            PdpSubGroup pdpSubGroup = new PdpSubGroup();
-            pdpSubGroup.setPdpType("type");
-            pdpSubGroup.setDesiredInstanceCount(123);
-            pdpSubGroup.setSupportedPolicyTypes(new ArrayList<>());
-            pdpSubGroup.getSupportedPolicyTypes().add(new ToscaPolicyTypeIdentifier("type", "7.8.9"));
-            pdpGroup.getPdpSubgroups().add(pdpSubGroup);
-
-            Pdp pdp = new Pdp();
-            pdp.setInstanceId("type-0");
-            pdp.setMessage("Hello");
-            pdp.setPdpState(PdpState.ACTIVE);
-            pdp.setHealthy(PdpHealthStatus.UNKNOWN);
-            pdpSubGroup.setPdpInstances(new ArrayList<>());
-            pdpSubGroup.getPdpInstances().add(pdp);
-
-            assertEquals(123, databaseProvider.createPdpGroups(groupList).get(0).getPdpSubgroups().get(0)
-                    .getDesiredInstanceCount());
-            assertEquals(1, databaseProvider.getPdpGroups("group").size());
-
-            pdpSubGroup.setDesiredInstanceCount(234);
-            databaseProvider.updatePdpSubGroup("group", pdpSubGroup);
-            assertEquals(234,
-                    databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0).getDesiredInstanceCount());
-
-            assertEquals("Hello", databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0)
-                    .getPdpInstances().get(0).getMessage());
-            pdp.setMessage("Howdy");
-            databaseProvider.updatePdp("group", "type", pdp);
-            assertEquals("Howdy", databaseProvider.getPdpGroups("group").get(0).getPdpSubgroups().get(0)
-                    .getPdpInstances().get(0).getMessage());
-
-            assertThatThrownBy(() -> {
-                databaseProvider.deletePdpGroup("name");
-            }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist");
-
-            assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup("group").getName());
-
-            assertEquals(0, databaseProvider.getPdpStatistics(null).size());
-
-            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");
-        }
+    public void testDeletePolicyTypeSupportedInSubgroup() throws PfModelException {
+        List<ToscaPolicyTypeIdentifier> supportedPolicyTypes = new ArrayList<>();
+        supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier("pt1", "0.0.1"));
+        supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier("pt2", "0.0.1"));
+
+        PdpSubGroup subGroup = new PdpSubGroup();
+        subGroup.setPdpType("pdpType");
+        subGroup.setSupportedPolicyTypes(supportedPolicyTypes);
+
+        List<PdpSubGroup> pdpSubgroups = new ArrayList<>();
+        pdpSubgroups.add(subGroup);
+
+        PdpGroup pdpGroup = new PdpGroup();
+        pdpGroup.setName("pdpGroup");
+        pdpGroup.setPdpGroupState(PdpState.PASSIVE);
+        pdpGroup.setPdpSubgroups(pdpSubgroups);
+
+        List<PdpGroup> pdpGroups = new ArrayList<>();
+        pdpGroups.add(pdpGroup);
+
+        PolicyModelsProvider databaseProvider =
+                new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+
+        databaseProvider.createPdpGroups(pdpGroups);
+
+        assertThatThrownBy(() -> databaseProvider.deletePolicyType("pt2", "0.0.1"))
+                .hasMessageContaining("policy type is in use, it is referenced in PDP group pdpGroup subgroup pdpType");
+
+        assertThatThrownBy(() -> databaseProvider.deletePolicyType("pt0", "0.0.1"))
+                .hasMessageContaining("service template not found in database");
+
+        databaseProvider.close();
     }
 }