Consolidate PolicyRestAdapter setup

[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / test / XACMLPAPTest.java

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
index 6ebc74a..ebfbf55 100644 (file)
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
@@ -24,7 +24,9 @@ package org.onap.policy.pap.test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
+
 import com.mockrunner.mock.web.MockServletInputStream;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -36,11 +38,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
@@ -79,7 +83,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletConfig;
 import org.springframework.orm.hibernate4.LocalSessionFactoryBuilder;
 
-
 public class XACMLPAPTest {
     private static final Log logger = LogFactory.getLog(XACMLPAPTest.class);
 
@@ -93,10 +96,6 @@ public class XACMLPAPTest {
     private static SessionFactory sessionFactory;
     private static CommonClassDao commonClassDao;
 
-    private static final String DEFAULT_DB_DRIVER = "org.h2.Driver";
-    private static final String DEFAULT_DB_USER = "sa";
-    private static final String DEFAULT_DB_PWD = "";
-
     @BeforeClass
     public static void beforeClassSetup() throws ServletException {
         sessionFactory = PolicyDBDaoTest.setupH2DbDaoImpl("xacmlpaptest");
@@ -127,6 +126,7 @@ public class XACMLPAPTest {
     public void testInit() {
         httpServletRequest = Mockito.mock(HttpServletRequest.class);
         httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+        logger.info(httpServletResponse);
         Mockito.when(httpServletRequest.getHeaderNames()).thenReturn(Collections.enumeration(headers));
         Mockito.when(httpServletRequest.getAttributeNames()).thenReturn(Collections.enumeration(headers));
         CommonClassDaoImpl.setSessionfactory(sessionFactory);
@@ -163,7 +163,8 @@ public class XACMLPAPTest {
         MockServletInputStream mockInput =
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
-
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -192,6 +193,8 @@ public class XACMLPAPTest {
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
         setPolicyCreation();
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -215,6 +218,8 @@ public class XACMLPAPTest {
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
         setPolicyCreation();
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -238,6 +243,8 @@ public class XACMLPAPTest {
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
         setPolicyCreation();
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -257,6 +264,8 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -287,6 +296,8 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -318,11 +329,12 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
 
-
     @Test
     public void testDecisonBLGuardPolicy() throws IOException, ServletException, SQLException {
         httpServletRequest = Mockito.mock(HttpServletRequest.class);
@@ -346,6 +358,8 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -369,6 +383,8 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPAPPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
@@ -425,11 +441,12 @@ public class XACMLPAPTest {
                 new MockServletInputStream(PolicyUtils.objectToJsonString(newPapPolicy).getBytes());
         Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
 
+        logger.info(httpServletRequest);
+        logger.info(httpServletResponse);
         pap.service(httpServletRequest, httpServletResponse);
         Mockito.verify(httpServletResponse).addHeader("operation", "create");
     }
 
-
     private void setPolicyCreation() {
         CommonClassDao commonClassDao = Mockito.mock(CommonClassDao.class);
         PolicyCreation.setCommonClassDao(commonClassDao);
@@ -678,7 +695,6 @@ public class XACMLPAPTest {
         // Verify
         Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
 
-
         httpServletRequest = Mockito.mock(HttpServletRequest.class);
         httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
         json = "{\"dictionaryFields\":{\"attributeName\":\"TestMMrestAPI1\",\"type\":\"REST\",\"url\":\"testsomeurl"
@@ -897,14 +913,14 @@ public class XACMLPAPTest {
         try {
             Mockito.when(httpServletResponse.getOutputStream()).thenReturn(mockOutput);
         } catch (IOException e) {
-            fail();
+            fail(e.getMessage());
         }
 
         try {
             pap.service(httpServletRequest, httpServletResponse);
             assertTrue(true);
         } catch (Exception e) {
-            fail();
+            fail(e.getMessage());
         }
     }