X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fhandler%2FDeleteHandlerTest.java;h=a9da00d5ac2fcf9b26cfc99867c83dc9495773b5;hb=349714f2b187d55560fd8ed9a461f64cac233743;hp=73540033f0232ad6a0dff5e30966dca988dde743;hpb=c72526cde70d6b2899d9e4bbc40e096e0ecf1b7d;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
index 73540033f..a9da00d5a 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
@@ -23,11 +23,13 @@ package org.onap.policy.pap.xacml.rest.handler;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
+
 import com.mockrunner.mock.web.MockHttpServletRequest;
 import com.mockrunner.mock.web.MockHttpServletResponse;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import org.hibernate.Session;
@@ -37,10 +39,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.common.logging.OnapLoggingContext;
 import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
 import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
 import org.onap.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
+import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.PolicyEntity;
 import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 import org.onap.policy.xacml.std.pap.StdEngine;
@@ -93,31 +96,52 @@ public class DeleteHandlerTest {
         PolicyElasticSearchController controller = Mockito.mock(PolicyElasticSearchController.class);
         PowerMockito.whenNew(PolicyElasticSearchController.class).withNoArguments().thenReturn(controller);
 
-		// Test deletion from PAP
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		try {
-			handler.doApiDeleteFromPap(request, response);
-		} catch (Exception ex) {
-			fail("Not expecting an exception: " + ex);
-		}
+        // Test deletion from PAP
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        handler.doApiDeleteFromPap(request, response);
 
         // Test deletion from PDP
-        ONAPLoggingContext loggingContext = Mockito.mock(ONAPLoggingContext.class);
-        try {
-            handler.doApiDeleteFromPdp(request, response, loggingContext);
-        }
-        catch (Exception ex) {
-            fail("Not expecting an exception: " + ex);
-        }
-
-		// Test delete entity
-		PolicyEntity policyEntity = new PolicyEntity();
-		policyEntity.setPolicyName("testVal");
-		String result = DeleteHandler.deletePolicyEntityData(policyEntity);
-		assertEquals(result, "success");
-
-		// Test check entity
-		List<?> peResult = Collections.emptyList();
-		assertEquals(DeleteHandler.checkPolicyGroupEntity(peResult), false);
-	}
+        OnapLoggingContext loggingContext = Mockito.mock(OnapLoggingContext.class);
+        handler.doApiDeleteFromPdp(request, response, loggingContext);
+
+        // Test delete entity
+        PolicyEntity policyEntity = new PolicyEntity();
+        policyEntity.setPolicyName("testVal");
+        String result = DeleteHandler.deletePolicyEntityData(policyEntity);
+        assertEquals(result, "success");
+
+        // Test check entity
+        List<?> peResult = Collections.emptyList();
+        assertEquals(DeleteHandler.checkPolicyGroupEntity(peResult), false);
+    }
+
+    @Test
+    public void testDoDeletePap() throws IOException {
+        CommonClassDao dao = Mockito.mock(CommonClassDao.class);
+        DeleteHandler handler = new DeleteHandler(dao);
+
+        // Mock request
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setBodyContent(
+            "{\n\"PAPPolicyType\": \"StdPAPPolicy\", \"policyName\": \"foo.Config_name.1.xml\", \"deleteCondition\": \"All Versions\"\n}\n");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        handler.doApiDeleteFromPap(request, response);
+        assertTrue(response.containsHeader("error"));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testDoDeletePdp() throws IOException {
+        CommonClassDao dao = Mockito.mock(CommonClassDao.class);
+        DeleteHandler handler = new DeleteHandler(dao);
+        OnapLoggingContext loggingContext = new OnapLoggingContext();
+
+        // Mock request
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setBodyContent(
+            "{\n\"PAPPolicyType\": \"StdPAPPolicy\", \"policyName\": \"foo.Config_name.1.xml\", \"deleteCondition\": \"All Versions\"\n}\n");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        handler.doApiDeleteFromPdp(request, response, loggingContext);
+    }
 }