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=67a1449f663a5a0a517e35fc97f93413e636ac72;hb=7a03b4a98e74635ba9cf75ac360be0749c1d98cf;hp=a57cc956de1d44129c649740181c33185542a305;hpb=ed54f1f94a43e9fc5e353eb2c7111dcc552be18e;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 a57cc956d..67a1449f6 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
@@ -30,9 +30,10 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Date;
 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.PdpGroupFilter;
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;
@@ -76,12 +77,7 @@ public class DummyPolicyModelsProviderTest {
 
     @Test
     public void testProviderMethods() throws Exception {
-        PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters();
-        parameters.setImplementation(DummyPolicyModelsProviderImpl.class.getName());
-        parameters.setDatabaseUrl("jdbc:dummy");
-        parameters.setPersistenceUnit("dummy");
-
-        PolicyModelsProvider dummyProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+        PolicyModelsProvider dummyProvider = setUpDummyProvider();
         dummyProvider.init();
 
         assertNotNull(dummyProvider.getPolicyTypes("name", VERSION));
@@ -105,6 +101,12 @@ public class DummyPolicyModelsProviderTest {
         assertTrue(dummyProvider.createPdpGroups(new ArrayList<>()).isEmpty());
         assertTrue(dummyProvider.updatePdpGroups(new ArrayList<>()).isEmpty());
         assertNull(dummyProvider.deletePdpGroup("name"));
+    }
+
+    @Test
+    public void testProviderMethodsParameters() throws Exception {
+        PolicyModelsProvider dummyProvider = setUpDummyProvider();
+        dummyProvider.init();
 
         dummyProvider.updatePdpSubGroup("name", new PdpSubGroup());
         dummyProvider.updatePdp("name", "type", new Pdp());
@@ -112,15 +114,18 @@ public class DummyPolicyModelsProviderTest {
         assertTrue(dummyProvider.getPdpStatistics("name", null).isEmpty());
 
         assertTrue(
-                dummyProvider.getFilteredPdpStatistics("name", null, null, new Date(), new Date(), null, 0).isEmpty());
+                dummyProvider.getFilteredPdpStatistics("name", null, null,
+                    Instant.now(), Instant.now(), null, 0).isEmpty());
         assertTrue(dummyProvider.createPdpStatistics(null).isEmpty());
         assertTrue(dummyProvider.updatePdpStatistics(null).isEmpty());
-        assertTrue(dummyProvider.deletePdpStatistics(null, new Date()).isEmpty());
+        assertTrue(dummyProvider.deletePdpStatistics(null, Instant.now()).isEmpty());
 
         assertThat(dummyProvider.getAllPolicyStatus()).isEmpty();
-        assertThat(dummyProvider.getAllPolicyStatus(new ToscaConceptIdentifierOptVersion("MyPolicy", null))).isEmpty();
+        assertThat(dummyProvider.getAllPolicyStatus(new ToscaConceptIdentifierOptVersion("MyPolicy",
+            null))).isEmpty();
         assertThat(dummyProvider.getGroupPolicyStatus("name")).isEmpty();
-        assertThatCode(() -> dummyProvider.cudPolicyStatus(null, null, null)).doesNotThrowAnyException();
+        assertThatCode(() -> dummyProvider.cudPolicyStatus(null, null,
+            null)).doesNotThrowAnyException();
     }
 
     @Test
@@ -135,4 +140,14 @@ public class DummyPolicyModelsProviderTest {
             assertThatThrownBy(resp::getBadDummyResponse2).hasMessage("error serializing object");
         }
     }
+
+    private PolicyModelsProvider setUpDummyProvider() throws PfModelException {
+        PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters();
+        parameters.setImplementation(DummyPolicyModelsProviderImpl.class.getName());
+        parameters.setDatabaseUrl("jdbc:dummy");
+        parameters.setPersistenceUnit("dummy");
+
+        PolicyModelsProvider dummyProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+        return dummyProvider;
+    }
 }