1 files changed, 69 insertions, 22 deletions

diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/e2e/PolicyStatusTest.java b/main/src/test/java/org/onap/policy/pap/main/rest/e2e/PolicyStatusTest.java
index 19a5f990..b44d4af7 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/e2e/PolicyStatusTest.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/e2e/PolicyStatusTest.java
@@ -3,6 +3,7 @@
  * ONAP PAP
  * ================================================================================
  * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 package org.onap.policy.pap.main.rest.e2e;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import javax.ws.rs.client.Invocation;
@@ -29,9 +31,15 @@ import javax.ws.rs.core.Response;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.models.pap.concepts.PolicyStatus;
+import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
+import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.State;
 
 public class PolicyStatusTest extends End2EndBase {
+    private static final String POLICY_NAME = "onap.restart.tca";
+    private static final String POLICY_TYPE_NAME = "onap.policies.monitoring.cdap.tca.hi.lo.app";
+    private static final String VERSION = "1.0.0";
     private static final String POLICY_STATUS_ENDPOINT = "policies/deployed";
+    private static final String POLICY_DEPLOYMENT_STATUS_ENDPOINT = "policies/status";
 
     /**
      * Starts Main and adds policies to the DB.
@@ -54,15 +62,7 @@ public class PolicyStatusTest extends End2EndBase {
 
         List<PolicyStatus> resp = rawresp.readEntity(new GenericType<List<PolicyStatus>>() {});
         assertEquals(1, resp.size());
-
-        PolicyStatus status = resp.get(0);
-        assertEquals("onap.restart.tca", status.getPolicyId());
-        assertEquals("1.0.0", status.getPolicyVersion());
-        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", status.getPolicyTypeId());
-        assertEquals("1.0.0", status.getPolicyTypeVersion());
-        assertEquals(0, status.getFailureCount());
-        assertEquals(1, status.getIncompleteCount());
-        assertEquals(0, status.getSuccessCount());
+        checkAssertions(resp.get(0));
     }
 
     @Test
@@ -75,15 +75,7 @@ public class PolicyStatusTest extends End2EndBase {
 
         List<PolicyStatus> resp = rawresp.readEntity(new GenericType<List<PolicyStatus>>() {});
         assertEquals(1, resp.size());
-
-        PolicyStatus status = resp.get(0);
-        assertEquals("onap.restart.tca", status.getPolicyId());
-        assertEquals("1.0.0", status.getPolicyVersion());
-        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", status.getPolicyTypeId());
-        assertEquals("1.0.0", status.getPolicyTypeVersion());
-        assertEquals(0, status.getFailureCount());
-        assertEquals(1, status.getIncompleteCount());
-        assertEquals(0, status.getSuccessCount());
+        checkAssertions(resp.get(0));
     }
 
     @Test
@@ -95,12 +87,67 @@ public class PolicyStatusTest extends End2EndBase {
         assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
 
         PolicyStatus status = rawresp.readEntity(PolicyStatus.class);
-        assertEquals("onap.restart.tca", status.getPolicyId());
-        assertEquals("1.0.0", status.getPolicyVersion());
-        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", status.getPolicyTypeId());
-        assertEquals("1.0.0", status.getPolicyTypeVersion());
+        checkAssertions(status);
+    }
+
+    @Test
+    public void testGetStatusOfAllDeployedPolicies() throws Exception {
+        String uri = POLICY_DEPLOYMENT_STATUS_ENDPOINT;
+
+        Invocation.Builder invocationBuilder = sendRequest(uri);
+        Response rawresp = invocationBuilder.get();
+        assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
+
+        List<PdpPolicyStatus> resp = rawresp.readEntity(new GenericType<List<PdpPolicyStatus>>() {});
+        assertEquals(1, resp.size());
+        checkAssertionsForDeploymentStatus(resp.get(0));
+    }
+
+    @Test
+    public void testGetStatusOfDeployedPolicies() throws Exception {
+        String uri = POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/policyStatus/onap.restart.tca";
+
+        Invocation.Builder invocationBuilder = sendRequest(uri);
+        Response rawresp = invocationBuilder.get();
+        assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
+
+        List<PdpPolicyStatus> resp = rawresp.readEntity(new GenericType<List<PdpPolicyStatus>>() {});
+        assertEquals(1, resp.size());
+        checkAssertionsForDeploymentStatus(resp.get(0));
+    }
+
+    @Test
+    public void testGetStatusOfDeployedPolicy() throws Exception {
+        String uri = POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/policyStatus/onap.restart.tca/1.0.0";
+
+        Invocation.Builder invocationBuilder = sendRequest(uri);
+        Response rawresp = invocationBuilder.get();
+        assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
+
+        PdpPolicyStatus status = rawresp.readEntity(PdpPolicyStatus.class);
+        checkAssertionsForDeploymentStatus(status);
+    }
+
+
+    private void checkAssertions(PolicyStatus status) {
+        assertEquals(POLICY_NAME, status.getPolicyId());
+        assertEquals(VERSION, status.getPolicyVersion());
+        assertEquals(POLICY_TYPE_NAME, status.getPolicyTypeId());
+        assertEquals(VERSION, status.getPolicyTypeVersion());
         assertEquals(0, status.getFailureCount());
         assertEquals(1, status.getIncompleteCount());
         assertEquals(0, status.getSuccessCount());
     }
+
+    private void checkAssertionsForDeploymentStatus(PdpPolicyStatus status) {
+        assertEquals(POLICY_NAME, status.getPolicy().getName());
+        assertEquals(VERSION, status.getPolicy().getVersion());
+        assertEquals(POLICY_TYPE_NAME, status.getPolicyType().getName());
+        assertEquals(VERSION, status.getPolicyType().getVersion());
+        assertEquals("policyStatus", status.getPdpGroup());
+        assertEquals("pdpB_1", status.getPdpId());
+        assertEquals("pdpTypeB", status.getPdpType());
+        assertEquals(State.WAITING, status.getState());
+        assertTrue(status.isDeploy());
+    }
 }