Fix config files to remove outdated configuration for hibernate

[policy/models.git] / models-provider / src / test / java / org / onap / policy / models / provider / revisionhierarchy / HierarchyFetchTest.java

diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/revisionhierarchy/HierarchyFetchTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/revisionhierarchy/HierarchyFetchTest.java
index 043968b..015bbc5 100644 (file)
--- a/models-provider/src/test/java/org/onap/policy/models/provider/revisionhierarchy/HierarchyFetchTest.java
+++ b/models-provider/src/test/java/org/onap/policy/models/provider/revisionhierarchy/HierarchyFetchTest.java
@@ -1,6 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
+ *  Copyright (C) 2020-2021, 2023-2024 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2021 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.
@@ -23,15 +25,15 @@ package org.onap.policy.models.provider.revisionhierarchy;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertEquals;
 
-import java.util.Base64;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.utils.coder.YamlJsonTranslator;
 import org.onap.policy.common.utils.resources.TextFileUtils;
+import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.provider.PolicyModelsProvider;
 import org.onap.policy.models.provider.PolicyModelsProviderFactory;
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;
@@ -43,20 +45,31 @@ public class HierarchyFetchTest {
 
     private static PolicyModelsProviderParameters parameters;
 
+    private PolicyModelsProvider databaseProvider;
+
     @BeforeClass
     public static void beforeSetupParameters() {
         parameters = new PolicyModelsProviderParameters();
         parameters.setDatabaseDriver("org.h2.Driver");
-        parameters.setDatabaseUrl("jdbc:h2:mem:testdb");
+        parameters.setDatabaseUrl("jdbc:h2:mem:HierarchyFetchTest");
         parameters.setDatabaseUser("policy");
-        parameters.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes()));
+        parameters.setDatabasePassword("P01icY");
         parameters.setPersistenceUnit("ToscaConceptTest");
     }
 
+    /**
+     * Closes the DB.
+     */
+    @After
+    public void tearDown() throws PfModelException {
+        if (databaseProvider != null) {
+            databaseProvider.close();
+        }
+    }
+
     @Test
     public void testMultipleVersions() throws Exception {
-        PolicyModelsProvider databaseProvider =
-            new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+        databaseProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
 
         ToscaServiceTemplate serviceTemplate = new YamlJsonTranslator().fromYaml(
             TextFileUtils
@@ -81,33 +94,29 @@ public class HierarchyFetchTest {
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(1, fetchedServiceTemplate.getPolicyTypes().size());
         ToscaPolicyType fetchedPolicyType = fetchedServiceTemplate.getPolicyTypes().values().iterator().next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(3, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0",
+            "3.0.0", fetchedServiceTemplate, 3);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0", "1.0.0");
         assertOldDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(1, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyType = fetchedServiceTemplate.getPolicyTypes().values().iterator().next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("1.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0",
+            "1.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0", "1.1.0");
         assertOldDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(1, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyType = fetchedServiceTemplate.getPolicyTypes().values().iterator().next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("2.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0",
+            "2.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0", "1.2.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(1, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyType = fetchedServiceTemplate.getPolicyTypes().values().iterator().next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0",
+            "3.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1", null);
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
@@ -115,184 +124,159 @@ public class HierarchyFetchTest {
         Iterator<ToscaPolicyType> fetchedPolicyTypeIterator =
             fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(3, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1",
+            "3.0.0", fetchedServiceTemplate, 3);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1", "1.0.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(2, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("1.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1",
+            "1.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1", "1.1.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(2, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("2.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1",
+            "2.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1", "1.2.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(2, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1",
+            "3.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2", null);
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(3, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(3, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2",
+            "3.0.0", fetchedServiceTemplate, 3);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2", "1.0.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(3, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("1.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2",
+            "1.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2", "1.1.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(3, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("2.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2",
+            "2.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2", "1.2.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(3, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2",
+            "3.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2.3", null);
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(4, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2.3", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(3, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2.3",
+            "3.0.0", fetchedServiceTemplate, 3);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2.3", "1.0.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(4, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2.3", fetchedPolicyType.getName());
-        assertEquals("1.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2.3",
+            "1.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2.3", "1.1.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(4, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2.3", fetchedPolicyType.getName());
-        assertEquals("2.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2.3",
+            "2.0.0", fetchedServiceTemplate, 1);
 
         fetchedServiceTemplate = databaseProvider.getPolicies("onap.policies.PolicyLevel0.1.2.3", "1.2.0");
         assertLatestDataTypesAreReturned(fetchedServiceTemplate);
         assertEquals(4, fetchedServiceTemplate.getPolicyTypes().size());
         fetchedPolicyTypeIterator = fetchedServiceTemplate.getPolicyTypes().values().iterator();
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
+        checkNameVersion(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2", "3.0.0");
         fetchedPolicyType = fetchedPolicyTypeIterator.next();
-        assertEquals("onap.policies.PolicyTypeLevel0.1.2.3", fetchedPolicyType.getName());
-        assertEquals("3.0.0", fetchedPolicyType.getVersion());
-        assertEquals(1, countReturnedPolicies(fetchedServiceTemplate));
+        checkEqualsPolicyType(fetchedPolicyType, "onap.policies.PolicyTypeLevel0.1.2.3",
+            "3.0.0", fetchedServiceTemplate, 1);
 
         databaseProvider.close();
     }
 
+    private void checkNameVersion(ToscaPolicyType fetchedPolicyType, String name, String ver) {
+        assertEquals(name, fetchedPolicyType.getName());
+        assertEquals(ver, fetchedPolicyType.getVersion());
+    }
+
+    private void checkEqualsPolicyType(ToscaPolicyType fetchedPolicyType, String name, String ver,
+        ToscaServiceTemplate fetchedServiceTemplate, int policies) {
+        checkNameVersion(fetchedPolicyType, name, ver);
+        assertEquals(policies, countReturnedPolicies(fetchedServiceTemplate));
+    }
+
     private void assertOldDataTypesAreReturned(final ToscaServiceTemplate fetchedServiceTemplate) {
         assertEquals(6, fetchedServiceTemplate.getDataTypes().size());
         assertEquals("1.0.0", fetchedServiceTemplate.getDataTypes().get("policy.data.DataType0").getVersion());