Merge "Add impl of more PDP persistence"

[policy/models.git] / models-provider / src / test / java / org / onap / policy / models / provider / impl / DatabasePolicyModelsProviderTest.java

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 1631d9b..8a83f44 100644 (file)
--- 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
@@ -21,21 +21,21 @@
 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.fail;
 
+import java.util.ArrayList;
 import java.util.Base64;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.pdp.concepts.PdpGroups;
 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.ToscaServiceTemplate;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyGuardPolicyInput;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
-import org.onap.policy.models.tosca.simple.concepts.ToscaServiceTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,6 +70,7 @@ 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\"");
 
@@ -117,12 +118,18 @@ public class DatabasePolicyModelsProviderTest {
     public void testProviderMethodsNull() throws Exception {
         PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
-        databaseProvider.init();
 
         assertThatThrownBy(() -> {
-            databaseProvider.getPolicyTypes(null);
-        }).hasMessage("policyTypeKey is marked @NonNull but is null");
+            databaseProvider.getPolicyTypes(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.getPolicyTypes("aaa", null);
+        }).hasMessage("version is marked @NonNull but is null");
 
+        assertThatThrownBy(() -> {
+            databaseProvider.getPolicyTypes(null, "aaa");
+        }).hasMessage("name is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
             databaseProvider.createPolicyTypes(null);
@@ -133,12 +140,28 @@ public class DatabasePolicyModelsProviderTest {
         }).hasMessage("serviceTemplate is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
-            databaseProvider.deletePolicyTypes(null);
-        }).hasMessage("policyTypeKey is marked @NonNull but is null");
+            databaseProvider.deletePolicyType(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.deletePolicyType("aaa", null);
+        }).hasMessage("version is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.deletePolicyType(null, "aaa");
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.getPolicies(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.getPolicies(null, "aaa");
+        }).hasMessage("name is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
-            databaseProvider.getPolicies(null);
-        }).hasMessage("policyKey is marked @NonNull but is null");
+            databaseProvider.getPolicies("aaa", null);
+        }).hasMessage("version is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
             databaseProvider.createPolicies(null);
@@ -149,8 +172,16 @@ public class DatabasePolicyModelsProviderTest {
         }).hasMessage("serviceTemplate is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
-            databaseProvider.deletePolicies(null);
-        }).hasMessage("policyKey is marked @NonNull but is null");
+            databaseProvider.deletePolicy(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.deletePolicy(null, "aaa");
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            databaseProvider.deletePolicy("aaa", null);
+        }).hasMessage("version is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
             databaseProvider.getOperationalPolicy(null);
@@ -184,10 +215,6 @@ public class DatabasePolicyModelsProviderTest {
             databaseProvider.deleteGuardPolicy(null);
         }).hasMessage("policyId is marked @NonNull but is null");
 
-        assertThatThrownBy(() -> {
-            databaseProvider.getPdpGroups(null);
-        }).hasMessage("pdpGroupFilter is marked @NonNull but is null");
-
         assertThatThrownBy(() -> {
             databaseProvider.createPdpGroups(null);
         }).hasMessage("pdpGroups is marked @NonNull but is null");
@@ -197,8 +224,8 @@ public class DatabasePolicyModelsProviderTest {
         }).hasMessage("pdpGroups is marked @NonNull but is null");
 
         assertThatThrownBy(() -> {
-            databaseProvider.deletePdpGroups(null);
-        }).hasMessage("pdpGroupFilter is marked @NonNull but is null");
+            databaseProvider.deletePdpGroup(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
 
         databaseProvider.close();
 
@@ -209,8 +236,10 @@ public class DatabasePolicyModelsProviderTest {
         PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
 
+        databaseProvider.close();
+
         assertThatThrownBy(() -> {
-            databaseProvider.getPolicyTypes(new PfConceptKey());
+            databaseProvider.getPolicyTypes("name", "version");
         }).hasMessage("policy models provider is not initilaized");
     }
 
@@ -218,11 +247,10 @@ public class DatabasePolicyModelsProviderTest {
     public void testProviderMethods() {
         try (PolicyModelsProvider databaseProvider =
                 new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
-            databaseProvider.init();
 
             assertThatThrownBy(() -> {
-                databaseProvider.getPolicyTypes(new PfConceptKey());
-            }).hasMessage("policy type not found: NULL:0.0.0");
+                databaseProvider.getPolicyTypes("name", "version");
+            }).hasMessage("policy type not found: name:version");
 
             assertThatThrownBy(() -> {
                 databaseProvider.createPolicyTypes(new ToscaServiceTemplate());
@@ -233,12 +261,12 @@ public class DatabasePolicyModelsProviderTest {
             }).hasMessage("no policy types specified on service template");
 
             assertThatThrownBy(() -> {
-                databaseProvider.deletePolicyTypes(new PfConceptKey());
-            }).hasMessage("policy type not found: NULL:0.0.0");
+                databaseProvider.deletePolicyType("name", "version");
+            }).hasMessage("policy type not found: name:version");
 
             assertThatThrownBy(() -> {
-                databaseProvider.getPolicies(new PfConceptKey());
-            }).hasMessage("policy not found: NULL:0.0.0");
+                databaseProvider.getPolicies("name", "version");
+            }).hasMessage("policy not found: name:version");
 
             assertThatThrownBy(() -> {
                 databaseProvider.createPolicies(new ToscaServiceTemplate());
@@ -249,8 +277,8 @@ public class DatabasePolicyModelsProviderTest {
             }).hasMessage("topology template not specified on service template");
 
             assertThatThrownBy(() -> {
-                databaseProvider.deletePolicies(new PfConceptKey());
-            }).hasMessage("policy not found: NULL:0.0.0");
+                databaseProvider.deletePolicy("name", "version");
+            }).hasMessage("policy not found: name:version");
 
             assertThatThrownBy(() -> {
                 databaseProvider.getOperationalPolicy("policy_id");
@@ -284,10 +312,14 @@ public class DatabasePolicyModelsProviderTest {
                 databaseProvider.deleteGuardPolicy("policy_id");
             }).hasMessage("no policy found for policy ID: policy_id");
 
-            assertNotNull(databaseProvider.getPdpGroups("filter"));
-            assertNotNull(databaseProvider.createPdpGroups(new PdpGroups()));
-            assertNotNull(databaseProvider.updatePdpGroups(new PdpGroups()));
-            assertNotNull(databaseProvider.deletePdpGroups("filter"));
+            assertEquals(0, databaseProvider.getPdpGroups("name", "version").size());
+
+            assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>()));
+            assertNotNull(databaseProvider.updatePdpGroups(new ArrayList<>()));
+
+            assertThatThrownBy(() -> {
+                databaseProvider.deletePdpGroup("name", "version");
+            }).hasMessage("delete of PDP group \"name:version\" failed, PDP group does not exist");
 
         } catch (Exception exc) {
             LOGGER.warn("test should not throw an exception", exc);