Removed supported policy types from Pdp-Status message

[policy/xacml-pdp.git] / main / src / test / java / org / onap / policy / pdpx / main / XacmlStateTest.java

diff --git a/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java b/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java
index eef1f1b..185f538 100644 (file)
--- a/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java
@@ -23,6 +23,7 @@ package org.onap.policy.pdpx.main;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -80,7 +81,7 @@ public class XacmlStateTest {
 
         XacmlPdpActivator.setCurrent(act);
 
-        state = new XacmlState(appmgr);
+        state = new XacmlState(appmgr, GROUP);
     }
 
     @AfterClass
@@ -103,11 +104,9 @@ public class XacmlStateTest {
         PdpStatus status = state.genHeartbeat();
         assertEquals(PdpHealthStatus.NOT_HEALTHY, status.getHealthy());
         assertEquals(hostName, status.getName());
+        assertEquals(GROUP, status.getPdpGroup());
         assertEquals(PDP_TYPE, status.getPdpType());
         assertEquals(PdpState.PASSIVE, status.getState());
-        assertEquals("[ToscaPolicyTypeIdentifier(name=nameA, version=typeA), "
-                        + "ToscaPolicyTypeIdentifier(name=nameB, version=typeB)]",
-                        status.getSupportedPolicyTypes().toString());
         assertTrue(status.getPolicies().isEmpty());
 
         // healthy
@@ -121,12 +120,13 @@ public class XacmlStateTest {
     public void testUpdateInternalStatePdpStateChange() {
         PdpStateChange req = new PdpStateChange();
         req.setName(hostName);
-        req.setPdpGroup(GROUP);
+        req.setPdpGroup("wrong-pdp-group");
         req.setPdpSubgroup(SUBGROUP);
         req.setState(STATE);
 
         PdpStatus status = state.updateInternalState(req);
         assertEquals(PdpState.SAFE, status.getState());
+        assertEquals(GROUP, status.getPdpGroup());
 
         PdpResponseDetails resp = status.getResponse();
         assertNotNull(resp);
@@ -151,20 +151,26 @@ public class XacmlStateTest {
     @Test
     public void testUpdateInternalStatePdpUpdate() {
         PdpUpdate req = new PdpUpdate();
-        req.setPdpGroup(GROUP);
+        req.setPdpGroup("wrong-pdp-group");
         req.setPdpSubgroup(SUBGROUP);
 
-        PdpStatus status = state.updateInternalState(req);
+        PdpStatus status = state.updateInternalState(req, "");
 
         PdpResponseDetails resp = status.getResponse();
         assertNotNull(resp);
         assertEquals(req.getRequestId(), resp.getResponseTo());
         assertEquals(PdpResponseStatus.SUCCESS, resp.getResponseStatus());
+        assertNull(resp.getResponseMessage());
 
         // ensure info was saved
         status = state.genHeartbeat();
         assertEquals(GROUP, status.getPdpGroup());
         assertEquals(SUBGROUP, status.getPdpSubgroup());
+
+        status = state.updateInternalState(req, "Failed to load policy: failLoadPolicy1: null");
+        assertEquals("Failed to load policy: failLoadPolicy1: null", status.getResponse().getResponseMessage());
+        assertEquals(PdpResponseStatus.FAIL, status.getResponse().getResponseStatus());
+        assertEquals(GROUP, status.getPdpGroup());
     }
 
     @Test