X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PDP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Frest%2FXACMLPdpServletTest.java;h=14c231aed00a6fcec166fcd57b42c86dcdb79ac1;hp=8707ee0ff9de2a6c412af93172123fc820422dd3;hb=4179c96ba6fcc5816f3e35130430b2955bc5cbbf;hpb=939cf950022f89aec547d3a6a9f6b9443b7a8a95

diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
index 8707ee0ff..14c231aed 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
@@ -28,13 +28,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 import java.util.Random;
-
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,433 +51,418 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletConfig;
-
 import com.att.research.xacml.util.XACMLProperties;
 import com.mockrunner.mock.web.MockServletInputStream;
-
 import junit.framework.TestCase;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({IntegrityMonitor.class})
 public class XACMLPdpServletTest extends TestCase {
-  private static Logger LOGGER = FlexLogger.getLogger(XACMLPdpServletTest.class);
-  private List<String> headers = new ArrayList<>();
-
-  private HttpServletRequest httpServletRequest;
-  private HttpServletResponse httpServletResponse;
-  private ServletOutputStream mockOutput;
-  private ServletInputStream mockInput;
-  private ServletConfig servletConfig;
-  private XACMLPdpServlet pdpServlet;
-  private Properties properties;
-  private String resourceName;
-  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 = "";
-  private StdPDPStatus status;
-  private StdPDPPolicy foobarPolicy;
-
-  private static final String ERROR_TEXT = "Exception occurred: ";
-
-  @Override
-  @Before
-  public void setUp() {
-    status = new StdPDPStatus();
-    foobarPolicy = new StdPDPPolicy();
-    foobarPolicy.setId("foobar");
-    foobarPolicy.setVersion("123");
-    foobarPolicy.setName("nothing");
-    status.addLoadedPolicy(foobarPolicy);
-
-    properties = new Properties();
-    properties.put(IntegrityAuditProperties.DB_DRIVER, XACMLPdpServletTest.DEFAULT_DB_DRIVER);
-    properties.put(IntegrityAuditProperties.DB_URL, "jdbc:h2:file:./sql/xacmlTest");
-    properties.put(IntegrityAuditProperties.DB_USER, XACMLPdpServletTest.DEFAULT_DB_USER);
-    properties.put(IntegrityAuditProperties.DB_PWD, XACMLPdpServletTest.DEFAULT_DB_PWD);
-    properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
-    properties.put(IntegrityAuditProperties.NODE_TYPE, "pap");
-    resourceName = "siteA.pdp1";
-
-    System.setProperty("com.sun.management.jmxremote.port", "9999");
-
-    IntegrityMonitor im = null;
-    try {
-      im = IntegrityMonitor.getInstance(resourceName, properties);
-    } catch (Exception e) {
-      e.printStackTrace();
+    private static Logger LOGGER = FlexLogger.getLogger(XACMLPdpServletTest.class);
+    private List<String> headers = new ArrayList<>();
+
+    private HttpServletRequest httpServletRequest;
+    private HttpServletResponse httpServletResponse;
+    private ServletOutputStream mockOutput;
+    private ServletInputStream mockInput;
+    private ServletConfig servletConfig;
+    private XACMLPdpServlet pdpServlet;
+    private Properties properties;
+    private String resourceName;
+    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 = "";
+    private StdPDPStatus status;
+    private StdPDPPolicy foobarPolicy;
+
+    private static final String ERROR_TEXT = "Exception occurred: ";
+
+    @Override
+    @Before
+    public void setUp() {
+        status = new StdPDPStatus();
+        foobarPolicy = new StdPDPPolicy();
+        foobarPolicy.setId("foobar");
+        foobarPolicy.setVersion("123");
+        foobarPolicy.setName("nothing");
+        status.addLoadedPolicy(foobarPolicy);
+
+        properties = new Properties();
+        properties.put(IntegrityAuditProperties.DB_DRIVER, XACMLPdpServletTest.DEFAULT_DB_DRIVER);
+        properties.put(IntegrityAuditProperties.DB_URL, "jdbc:h2:file:./sql/xacmlTest");
+        properties.put(IntegrityAuditProperties.DB_USER, XACMLPdpServletTest.DEFAULT_DB_USER);
+        properties.put(IntegrityAuditProperties.DB_PWD, XACMLPdpServletTest.DEFAULT_DB_PWD);
+        properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
+        properties.put(IntegrityAuditProperties.NODE_TYPE, "pap");
+        resourceName = "siteA.pdp1";
+
+        System.setProperty("com.sun.management.jmxremote.port", "9999");
+
+        IntegrityMonitor im = null;
+        try {
+            im = IntegrityMonitor.getInstance(resourceName, properties);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        httpServletRequest = Mockito.mock(HttpServletRequest.class);
+        Mockito.when(httpServletRequest.getMethod()).thenReturn("POST");
+        Mockito.when(httpServletRequest.getHeaderNames()).thenReturn(Collections.enumeration(headers));
+        Mockito.when(httpServletRequest.getAttributeNames()).thenReturn(Collections.enumeration(headers));
+        Mockito.when(httpServletRequest.getRequestURI()).thenReturn("/pdp/test");
+
+        mockOutput = Mockito.mock(ServletOutputStream.class);
+
+        httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+
+        try {
+            Mockito.when(httpServletResponse.getOutputStream()).thenReturn(mockOutput);
+        } catch (IOException e) {
+            fail();
+        }
+
+        servletConfig = Mockito.mock(MockServletConfig.class);
+        // servletConfig
+        Mockito.when(servletConfig.getInitParameterNames()).thenReturn(Collections.enumeration(headers));
+        pdpServlet = new XACMLPdpServlet();
+        pdpServlet.setIm(im);
+
+        Mockito.when(servletConfig.getInitParameter("XACML_PROPERTIES_NAME"))
+                .thenReturn("src/test/resources/xacml.pdp.properties");
+
+        System.setProperty("xacml.properties", "src/test/resources/xacml.pdp.properties");
+        System.setProperty("xacml.rest.pdp.config", "src/test/resources/config_testing");
+        System.setProperty("xacml.rest.pdp.webapps", "src/test/resources/webapps");
+
+        System.setProperty("xacml.rest.pdp.register", "false");
+        System.setProperty("com.sun.management.jmxremote.port", "9999");
+
+        im = Mockito.mock(IntegrityMonitor.class);
+        // Need PowerMockito for mocking static method getInstance(...)
+        PowerMockito.mockStatic(IntegrityMonitor.class);
+        try {
+            // when IntegrityMonitor.getInstance is called, return the mock object
+            PowerMockito.when(IntegrityMonitor.getInstance(Mockito.anyString(), Mockito.any(Properties.class)))
+                    .thenReturn(im);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+        }
+
+        try {
+            Mockito.doNothing().when(im).startTransaction();
+        } catch (IntegrityMonitorException e) {
+            fail();
+        }
+        Mockito.doNothing().when(im).endTransaction();
     }
 
-    httpServletRequest = Mockito.mock(HttpServletRequest.class);
-    Mockito.when(httpServletRequest.getMethod()).thenReturn("POST");
-    Mockito.when(httpServletRequest.getHeaderNames()).thenReturn(Collections.enumeration(headers));
-    Mockito.when(httpServletRequest.getAttributeNames())
-        .thenReturn(Collections.enumeration(headers));
-    Mockito.when(httpServletRequest.getRequestURI()).thenReturn("/pdp/test");
-
-    mockOutput = Mockito.mock(ServletOutputStream.class);
-
-    httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
-
-    try {
-      Mockito.when(httpServletResponse.getOutputStream()).thenReturn(mockOutput);
-    } catch (IOException e) {
-      fail();
+    @Override
+    @After
+    public void tearDown() {
+        System.clearProperty("xacml.rest.pdp.config");
     }
 
-    servletConfig = Mockito.mock(MockServletConfig.class);
-    // servletConfig
-    Mockito.when(servletConfig.getInitParameterNames())
-        .thenReturn(Collections.enumeration(headers));
-    pdpServlet = new XACMLPdpServlet();
-    pdpServlet.setIm(im);
-
-    Mockito.when(servletConfig.getInitParameter("XACML_PROPERTIES_NAME"))
-        .thenReturn("src/test/resources/xacml.pdp.properties");
-
-    System.setProperty("xacml.properties", "src/test/resources/xacml.pdp.properties");
-    System.setProperty("xacml.rest.pdp.config", "src/test/resources/config_testing");
-    System.setProperty("xacml.rest.pdp.webapps", "src/test/resources/webapps");
-
-    System.setProperty("xacml.rest.pdp.register", "false");
-    System.setProperty("com.sun.management.jmxremote.port", "9999");
-
-    im = Mockito.mock(IntegrityMonitor.class);
-    // Need PowerMockito for mocking static method getInstance(...)
-    PowerMockito.mockStatic(IntegrityMonitor.class);
-    try {
-      // when IntegrityMonitor.getInstance is called, return the mock object
-      PowerMockito
-          .when(IntegrityMonitor.getInstance(Mockito.anyString(), Mockito.any(Properties.class)))
-          .thenReturn(im);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
+    @Test
+    public void testInit() {
+        LOGGER.info("XACMLPdpServletTest - testInit");
+        try {
+            pdpServlet.init(servletConfig);
+
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
 
-    try {
-      Mockito.doNothing().when(im).startTransaction();
-    } catch (IntegrityMonitorException e) {
-      fail();
-    }
-    Mockito.doNothing().when(im).endTransaction();
-  }
-
-  @Override
-  @After
-  public void tearDown()
-  {
-    System.clearProperty("xacml.rest.pdp.config");
-  }
-
-  @Test
-  public void testInit() {
-    LOGGER.info("XACMLPdpServletTest - testInit");
-    try {
-      pdpServlet.init(servletConfig);
-
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+    @Test
+    public void testUebNotification() {
+        LOGGER.info("XACMLPdpServletTest - testUebNotification");
+        try {
 
-    }
-
-  }
-
-  @Test
-  public void testUebNotification() {
-    LOGGER.info("XACMLPdpServletTest - testUebNotification");
-    try {
-
-      XACMLProperties.reloadProperties();
-      System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME,
-          "src/test/resources/xacml.pdp.ueb.properties");
-      XACMLProperties.getProperties();
+            XACMLProperties.reloadProperties();
+            System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME, "src/test/resources/xacml.pdp.ueb.properties");
+            XACMLProperties.getProperties();
 
-      pdpServlet.init(servletConfig);
+            pdpServlet.init(servletConfig);
 
-      status.setStatus(com.att.research.xacml.api.pap.PDPStatus.Status.UPDATING_CONFIGURATION);
-
-      XACMLPdpLoader.validatePolicies(properties, status);
-      XACMLPdpLoader.sendNotification();
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+            status.setStatus(com.att.research.xacml.api.pap.PDPStatus.Status.UPDATING_CONFIGURATION);
 
+            XACMLPdpLoader.validatePolicies(properties, status);
+            XACMLPdpLoader.sendNotification();
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
 
-  }
-
-  @Test
-  public void testDmaapNotification() {
-    LOGGER.info("XACMLPdpServletTest - testDmaapNotification");
-    try {
-
-      XACMLProperties.reloadProperties();
-      System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME,
-          "src/test/resources/xacml.pdp.dmaap.properties");
-      XACMLProperties.getProperties();
+    @Test
+    public void testDmaapNotification() {
+        LOGGER.info("XACMLPdpServletTest - testDmaapNotification");
+        try {
 
-      pdpServlet.init(servletConfig);
+            XACMLProperties.reloadProperties();
+            System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME, "src/test/resources/xacml.pdp.dmaap.properties");
+            XACMLProperties.getProperties();
 
-      status.setStatus(com.att.research.xacml.api.pap.PDPStatus.Status.UPDATING_CONFIGURATION);
+            pdpServlet.init(servletConfig);
 
-      XACMLPdpLoader.validatePolicies(properties, status);
-      XACMLPdpLoader.sendNotification();
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+            status.setStatus(com.att.research.xacml.api.pap.PDPStatus.Status.UPDATING_CONFIGURATION);
 
+            XACMLPdpLoader.validatePolicies(properties, status);
+            XACMLPdpLoader.sendNotification();
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
 
-  }
-
-
-  @Test
-  public void testXACMLPdpRegisterThread() {
-    LOGGER.info("XACMLPdpServletTest - testXACMLPdpRegisterThread");
-    try {
-      ONAPLoggingContext baseLoggingContext = new ONAPLoggingContext();
-      baseLoggingContext.setServer("localhost");
-      XACMLPdpRegisterThread regThread = new XACMLPdpRegisterThread(baseLoggingContext);
-      regThread.run();
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+    @Test
+    public void testXACMLPdpRegisterThread() {
+        LOGGER.info("XACMLPdpServletTest - testXACMLPdpRegisterThread");
+        try {
+            ONAPLoggingContext baseLoggingContext = new ONAPLoggingContext();
+            baseLoggingContext.setServer("localhost");
+            XACMLPdpRegisterThread regThread = new XACMLPdpRegisterThread(baseLoggingContext);
+            regThread.run();
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoGetNoTypeError() {
-    LOGGER.info("XACMLPdpServletTest - testDoGetNoTypeError");
-    try {
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doGet(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoGetNoTypeError() {
+        LOGGER.info("XACMLPdpServletTest - testDoGetNoTypeError");
+        try {
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doGet(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoGetConfigType() {
-    LOGGER.info("XACMLPdpServletTest - testDoGetConfigType");
-    Mockito.when(httpServletRequest.getParameter("type")).thenReturn("config");
-
-    try {
-      pdpServlet.init(servletConfig);
-      pdpServlet.doGet(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoGetConfigType() {
+        LOGGER.info("XACMLPdpServletTest - testDoGetConfigType");
+        Mockito.when(httpServletRequest.getParameter("type")).thenReturn("config");
+
+        try {
+            pdpServlet.init(servletConfig);
+            pdpServlet.doGet(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
+
     }
 
-  }
-
-  @Test
-  public void testDoGetTypeHb() {
-    LOGGER.info("XACMLPdpServletTest - testDoGetTypeHb");
-    try {
-      Mockito.when(httpServletRequest.getParameter("type")).thenReturn("hb");
-      pdpServlet.init(servletConfig);
-      pdpServlet.doGet(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+    @Test
+    public void testDoGetTypeHb() {
+        LOGGER.info("XACMLPdpServletTest - testDoGetTypeHb");
+        try {
+            Mockito.when(httpServletRequest.getParameter("type")).thenReturn("hb");
+            pdpServlet.init(servletConfig);
+            pdpServlet.doGet(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoGetTypeStatus() {
-    LOGGER.info("XACMLPdpServletTest - testDoGetTypeStatus");
-    try {
-      Mockito.when(httpServletRequest.getParameter("type")).thenReturn("Status");
-      pdpServlet.init(servletConfig);
-      pdpServlet.doGet(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoGetTypeStatus() {
+        LOGGER.info("XACMLPdpServletTest - testDoGetTypeStatus");
+        try {
+            Mockito.when(httpServletRequest.getParameter("type")).thenReturn("Status");
+            pdpServlet.init(servletConfig);
+            pdpServlet.doGet(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPost() {
-    LOGGER.info("XACMLPdpServletTest - testDoPost");
-    try {
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPost(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPost() {
+        LOGGER.info("XACMLPdpServletTest - testDoPost");
+        try {
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPost(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPostToLong() {
-    LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
-    try {
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(32768);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPost(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPostToLong() {
+        LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
+        try {
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(32768);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPost(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPostContentLengthNegative() {
-    LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
-    try {
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(-1);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPost(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPostContentLengthNegative() {
+        LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
+        try {
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(-1);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPost(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPostContentTypeNonValid() {
-    LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
-    try {
-      Mockito.when(httpServletRequest.getContentType()).thenReturn(";");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(30768);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPost(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPostContentTypeNonValid() {
+        LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
+        try {
+            Mockito.when(httpServletRequest.getContentType()).thenReturn(";");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(30768);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPost(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPostContentTypeConfigurationError() {
-    LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
-    try {
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(30768);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPost(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPostContentTypeConfigurationError() {
+        LOGGER.info("XACMLPdpServletTest - testDoPostToLong");
+        try {
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("stuff");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(30768);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPost(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPutCacheEmpty() {
-    LOGGER.info("XACMLPdpServletTest - testDoPutCacheEmpty");
-    mockInput = Mockito.mock(ServletInputStream.class);
-
-    try {
-      Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("cache");
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
-      Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPut(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
-          "PUT must contain at least one property");
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPutCacheEmpty() {
+        LOGGER.info("XACMLPdpServletTest - testDoPutCacheEmpty");
+        mockInput = Mockito.mock(ServletInputStream.class);
+
+        try {
+            Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("cache");
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
+            Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPut(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
+                    "PUT must contain at least one property");
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPutConfigPolicies() {
-    LOGGER.info("XACMLPdpServletTest - testDoPutConfigPolicies");
-    byte[] b = new byte[20];
-    new Random().nextBytes(b);
-
-    mockInput = new MockServletInputStream(b);
-
-    try {
-      Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
-      Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPut(httpServletRequest, httpServletResponse);
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPutConfigPolicies() {
+        LOGGER.info("XACMLPdpServletTest - testDoPutConfigPolicies");
+        byte[] b = new byte[20];
+        new Random().nextBytes(b);
+
+        mockInput = new MockServletInputStream(b);
+
+        try {
+            Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
+            Mockito.when(httpServletRequest.getInputStream()).thenReturn(mockInput);
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPut(httpServletRequest, httpServletResponse);
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  public void testDoPutToLong() {
-    LOGGER.info("XACMLPdpServletTest - testDoPutToLong");
-    try {
-      Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
-
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(1000000000);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPut(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
-          "Content-Length larger than server will accept.");
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    public void testDoPutToLong() {
+        LOGGER.info("XACMLPdpServletTest - testDoPutToLong");
+        try {
+            Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
+
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("text/x-java-properties");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(1000000000);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPut(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
+                    "Content-Length larger than server will accept.");
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDoPutInvalidContentType() {
-    LOGGER.info("XACMLPdpServletTest - testDoPutToLong");
-    try {
-      Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
-
-      Mockito.when(httpServletRequest.getContentType()).thenReturn("text/json");
-      Mockito.when(httpServletRequest.getContentLength()).thenReturn(32768);
-
-      pdpServlet.init(servletConfig);
-      pdpServlet.doPut(httpServletRequest, httpServletResponse);
-      Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
-          "Invalid cache: 'policies' or content-type: 'text/json'");
-      assertTrue(true);
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDoPutInvalidContentType() {
+        LOGGER.info("XACMLPdpServletTest - testDoPutToLong");
+        try {
+            Mockito.when(httpServletRequest.getParameter("cache")).thenReturn("policies");
+
+            Mockito.when(httpServletRequest.getContentType()).thenReturn("text/json");
+            Mockito.when(httpServletRequest.getContentLength()).thenReturn(32768);
+
+            pdpServlet.init(servletConfig);
+            pdpServlet.doPut(httpServletRequest, httpServletResponse);
+            Mockito.verify(httpServletResponse).sendError(HttpServletResponse.SC_BAD_REQUEST,
+                    "Invalid cache: 'policies' or content-type: 'text/json'");
+            assertTrue(true);
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
-
-  @Test
-  public void testDestroy() {
-    LOGGER.info("XACMLPdpServletTest - testDestroy");
-
-    try {
-      pdpServlet.init(servletConfig);
-      pdpServlet.destroy();
-    } catch (Exception e) {
-      LOGGER.error(ERROR_TEXT + e);
-      fail();
+
+    @Test
+    public void testDestroy() {
+        LOGGER.info("XACMLPdpServletTest - testDestroy");
+
+        try {
+            pdpServlet.init(servletConfig);
+            pdpServlet.destroy();
+        } catch (Exception e) {
+            LOGGER.error(ERROR_TEXT + e);
+            fail();
+        }
     }
-  }
 }