Add Control Loop Coordination policy.

[policy/xacml-pdp.git] / applications / guard / src / test / java / org / onap / policy / xacml / pdp / application / guard / GuardPdpApplicationTest.java

diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
index 17917af..c5cf032 100644 (file)
--- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
+++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java
@@ -53,11 +53,12 @@ import org.onap.policy.common.utils.resources.TextFileUtils;
 import org.onap.policy.models.decisions.concepts.DecisionRequest;
 import org.onap.policy.models.decisions.concepts.DecisionResponse;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
-import org.onap.policy.pdp.xacml.application.common.OnapOperationsHistoryDbao;
 import org.onap.policy.pdp.xacml.application.common.TestUtils;
 import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException;
 import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider;
 import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils;
+import org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecentOperationsPip;
+import org.onap.policy.pdp.xacml.application.common.operationshistory.Dbao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,7 +86,7 @@ public class GuardPdpApplicationTest {
      * instance of provider off for other tests to use.
      */
     @BeforeClass
-    public static void setUp() throws Exception {
+    public static void setup() throws Exception {
         LOGGER.info("Setting up class");
         //
         // Setup our temporary folder
@@ -131,21 +132,22 @@ public class GuardPdpApplicationTest {
         //
         requestVfCount1 = gson.decode(
                 TextFileUtils.getTextFileAsString(
-                    "../../main/src/test/resources/decisions/decision.guard.vfCount.1.input.json"),
+                    "src/test/resources/requests/guard.vfCount.1.json"),
                     DecisionRequest.class);
         requestVfCount3 = gson.decode(
                 TextFileUtils.getTextFileAsString(
-                    "../../main/src/test/resources/decisions/decision.guard.vfCount.3.input.json"),
+                    "src/test/resources/requests/guard.vfCount.3.json"),
                     DecisionRequest.class);
         requestVfCount6 = gson.decode(
                 TextFileUtils.getTextFileAsString(
-                    "../../main/src/test/resources/decisions/decision.guard.vfCount.6.input.json"),
+                    "src/test/resources/requests/guard.vfCount.6.json"),
                     DecisionRequest.class);
         //
         // Create EntityManager for manipulating DB
         //
+        String persistenceUnit = CountRecentOperationsPip.ISSUER_NAME + ".persistenceunit";
         em = Persistence.createEntityManagerFactory(
-                GuardPdpApplicationTest.properties.getProperty("historydb.persistenceunit"), properties)
+                GuardPdpApplicationTest.properties.getProperty(persistenceUnit), properties)
                 .createEntityManager();
     }
 
@@ -156,7 +158,7 @@ public class GuardPdpApplicationTest {
     @Before
     public void startClean() throws Exception {
         em.getTransaction().begin();
-        em.createQuery("DELETE FROM OnapOperationsHistoryDbao").executeUpdate();
+        em.createQuery("DELETE FROM Dbao").executeUpdate();
         em.getTransaction().commit();
     }
 
@@ -213,7 +215,7 @@ public class GuardPdpApplicationTest {
         // can support the correct policy types.
         //
         assertThat(service.supportedPolicyTypes()).isNotEmpty();
-        assertThat(service.supportedPolicyTypes().size()).isEqualTo(2);
+        assertThat(service.supportedPolicyTypes().size()).isEqualTo(3);
         assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
                 "onap.policies.controlloop.guard.FrequencyLimiter", "1.0.0"))).isTrue();
         assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
@@ -222,6 +224,10 @@ public class GuardPdpApplicationTest {
                 "onap.policies.controlloop.guard.MinMax", "1.0.0"))).isTrue();
         assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
                 "onap.policies.controlloop.guard.MinMax", "1.0.1"))).isFalse();
+        assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
+                "onap.policies.controlloop.guard.coordination.FirstBlocksSecond", "1.0.0"))).isTrue();
+        assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier(
+                "onap.policies.controlloop.guard.coordination.FirstBlocksSecond", "1.0.1"))).isFalse();
         assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier("onap.foo", "1.0.1"))).isFalse();
     }
 
@@ -357,10 +363,10 @@ public class GuardPdpApplicationTest {
         //
         // Add an entry
         //
-        OnapOperationsHistoryDbao newEntry = new OnapOperationsHistoryDbao();
+        Dbao newEntry = new Dbao();
         newEntry.setActor(properties.get("actor").toString());
         newEntry.setOperation(properties.get("recipe").toString());
-        newEntry.setClName(properties.get("clname").toString());
+        newEntry.setClosedLoopName(properties.get("clname").toString());
         newEntry.setOutcome("SUCCESS");
         newEntry.setStarttime(Date.from(Instant.now().minusMillis(20000)));
         newEntry.setEndtime(Date.from(Instant.now()));
@@ -372,8 +378,14 @@ public class GuardPdpApplicationTest {
         em.getTransaction().commit();
     }
 
+    /**
+     * Close the entity manager.
+     */
     @AfterClass
     public static void cleanup() throws Exception {
-        em.close();
+        if (em != null) {
+            em.close();
+        }
     }
+
 }