X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-provider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fprovider%2Fimpl%2FDummyPolicyModelsProviderTest.java;h=3e13d854cd927a3cefe28d1df92bfc6cab013296;hb=2e9186e1eb441b3ec47cf2a959e34b9409134aba;hp=bf3382fdcd78a2b4aa904fffa84e3b57b4142ced;hpb=cc740771e3fdf02bc6e9e02f1d4f4d6cc39afcb0;p=policy%2Fmodels.git

diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderTest.java
index bf3382fdc..3e13d854c 100644
--- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderTest.java
+++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderTest.java
@@ -20,19 +20,19 @@
 
 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 org.junit.Test;
-import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.pap.concepts.PdpGroups;
+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.legacy.concepts.LegacyGuardPolicy;
+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;
 
 /**
  * Test the dummy models provider implementation.
@@ -52,10 +52,10 @@ public class DummyPolicyModelsProviderTest {
 
         dummyProvider.init();
 
-        ToscaServiceTemplate serviceTemplate = dummyProvider.getPolicies(new PfConceptKey());
+        ToscaServiceTemplate serviceTemplate = dummyProvider.getPolicies("onap.vcpe.tca", "1.0.0");
         assertNotNull(serviceTemplate);
-        assertEquals("onap.vcpe.tca:1.0.0",
-                serviceTemplate.getTopologyTemplate().getPolicies().get("onap.vcpe.tca").getId());
+        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app",
+                serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get("onap.vcpe.tca").getType());
 
         dummyProvider.close();
     }
@@ -70,15 +70,15 @@ public class DummyPolicyModelsProviderTest {
         PolicyModelsProvider dummyProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
         dummyProvider.init();
 
-        assertNotNull(dummyProvider.getPolicyTypes(new PfConceptKey()));
+        assertNotNull(dummyProvider.getPolicyTypes("name", "version"));
         assertNotNull(dummyProvider.createPolicyTypes(new ToscaServiceTemplate()));
         assertNotNull(dummyProvider.updatePolicyTypes(new ToscaServiceTemplate()));
-        assertNotNull(dummyProvider.deletePolicyTypes(new PfConceptKey()));
+        assertNotNull(dummyProvider.deletePolicyTypes("name", "version"));
 
-        assertNotNull(dummyProvider.getPolicies(new PfConceptKey()));
+        assertNotNull(dummyProvider.getPolicies("name", "version"));
         assertNotNull(dummyProvider.createPolicies(new ToscaServiceTemplate()));
         assertNotNull(dummyProvider.updatePolicies(new ToscaServiceTemplate()));
-        assertNotNull(dummyProvider.deletePolicies(new PfConceptKey()));
+        assertNotNull(dummyProvider.deletePolicies("name", "version"));
 
         assertNotNull(dummyProvider.getOperationalPolicy("policy_id"));
         assertNotNull(dummyProvider.createOperationalPolicy(new LegacyOperationalPolicy()));
@@ -86,8 +86,8 @@ public class DummyPolicyModelsProviderTest {
         assertNotNull(dummyProvider.deleteOperationalPolicy("policy_id"));
 
         assertNotNull(dummyProvider.getGuardPolicy("policy_id"));
-        assertNotNull(dummyProvider.createGuardPolicy(new LegacyGuardPolicy()));
-        assertNotNull(dummyProvider.updateGuardPolicy(new LegacyGuardPolicy()));
+        assertNotNull(dummyProvider.createGuardPolicy(new LegacyGuardPolicyInput()));
+        assertNotNull(dummyProvider.updateGuardPolicy(new LegacyGuardPolicyInput()));
         assertNotNull(dummyProvider.deleteGuardPolicy("policy_id"));
 
         assertNotNull(dummyProvider.getPdpGroups("filter"));
@@ -95,134 +95,70 @@ public class DummyPolicyModelsProviderTest {
         assertNotNull(dummyProvider.updatePdpGroups(new PdpGroups()));
         assertNotNull(dummyProvider.deletePdpGroups("filter"));
 
-        try {
-            dummyProvider.getPolicyTypes(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyTypeKey is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        assertThatThrownBy(() -> {
+            dummyProvider.getPolicyTypes(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.createPolicyTypes(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("serviceTemplate is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.updatePolicyTypes(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("serviceTemplate is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
-            dummyProvider.deletePolicyTypes(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyTypeKey is marked @NonNull but is null", npe.getMessage());
-        }
-
-        try {
-            dummyProvider.getPolicies(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyKey is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
+            dummyProvider.deletePolicyTypes(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+
+        assertThatThrownBy(() -> {
+            dummyProvider.getPolicies(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.createPolicies(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("serviceTemplate is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.updatePolicies(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("serviceTemplate is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
-            dummyProvider.deletePolicies(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyKey is marked @NonNull but is null", npe.getMessage());
-        }
+        }).hasMessage("serviceTemplate is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
+            dummyProvider.deletePolicies(null, null);
+        }).hasMessage("name is marked @NonNull but is null");
 
-        try {
+        assertThatThrownBy(() -> {
             dummyProvider.getOperationalPolicy(null);
-
-
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyId is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("policyId is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.createOperationalPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("legacyOperationalPolicy is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.updateOperationalPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("legacyOperationalPolicy is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.deleteOperationalPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyId is marked @NonNull but is null", npe.getMessage());
-        }
+        }).hasMessage("policyId is marked @NonNull but is null");
 
-        try {
+        assertThatThrownBy(() -> {
             dummyProvider.getGuardPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyId is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("policyId is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.createGuardPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("legacyGuardPolicy is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.updateGuardPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("legacyGuardPolicy is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.deleteGuardPolicy(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("policyId is marked @NonNull but is null", npe.getMessage());
-        }
-
-        try {
-
+        }).hasMessage("policyId is marked @NonNull but is null");
 
+        assertThatThrownBy(() -> {
             dummyProvider.getPdpGroups(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("pdpGroupFilter is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("pdpGroupFilter is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.createPdpGroups(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("pdpGroups is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("pdpGroups is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.updatePdpGroups(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("pdpGroups is marked @NonNull but is null", npe.getMessage());
-        }
-        try {
+        }).hasMessage("pdpGroups is marked @NonNull but is null");
+        assertThatThrownBy(() -> {
             dummyProvider.deletePdpGroups(null);
-            fail("test should throw an exception");
-        } catch (Exception npe) {
-            assertEquals("pdpGroupFilter is marked @NonNull but is null", npe.getMessage());
-        }
+        }).hasMessage("pdpGroupFilter is marked @NonNull but is null");
 
         dummyProvider.close();
     }