X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FLogServletTest.java;h=931c00a24fee2a4b62d3fe4c0f23b1b7c6695813;hb=bda6aeaa60607ab4fe5af508156019d7bd5c0ce4;hp=e411bdc02599752d79d3694a132593d30ef06be8;hpb=24af12414c00a3e398e11ebe6d308490da3a618c;p=dmaap%2Fdatarouter.git diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java index e411bdc0..931c00a2 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java @@ -23,30 +23,35 @@ package org.onap.dmaap.datarouter.provisioning; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; +import jakarta.servlet.ServletOutputStream; import org.junit.Before; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.matches; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.when; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*"}) public class LogServletTest extends DrServletTestBase { private static EntityManagerFactory emf; @@ -58,6 +63,11 @@ public class LogServletTest extends DrServletTestBase { @Mock private HttpServletResponse response; + @Mock + private ServletOutputStream servletOutputStream; + + private ListAppender listAppender; + @BeforeClass public static void init() { emf = Persistence.createEntityManagerFactory("dr-unit-tests"); @@ -76,6 +86,7 @@ public class LogServletTest extends DrServletTestBase { @Before public void setUp() throws Exception { + listAppender = setTestLogger(LogServlet.class); logServlet = new LogServlet(true); setUpValidParameterValuesForMap(); } @@ -84,7 +95,8 @@ public class LogServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_DELETE_And_Is_Not_Allowed_Then_Forbidden_Response_Is_Generated() throws Exception { logServlet.doDelete(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), anyString()); + verifyEnteringExitCalled(listAppender); } @Test @@ -92,7 +104,8 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getPathInfo()).thenReturn(null); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); + verifyEnteringExitCalled(listAppender); } @Test @@ -100,7 +113,7 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("type")).thenReturn("bad_type"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test @@ -108,7 +121,7 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("publishId")).thenReturn("bad_PublishID'"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test @@ -116,7 +129,7 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("statusCode")).thenReturn("1'"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test @@ -124,7 +137,7 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("expiryReason")).thenReturn("bad_ExpiryReason"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test @@ -132,7 +145,7 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("start")).thenReturn("bad_startTime"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test @@ -140,37 +153,70 @@ public class LogServletTest extends DrServletTestBase { throws Exception { when(request.getParameter("end")).thenReturn("bad_endTime"); logServlet.doGet(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test - public void Given_Request_Is_HTTP_GET_And_Is_FeedLog_A_STATUS_OK_Response_Is_Generated() - throws Exception { + public void Given_Request_Is_HTTP_GET_And_Is_FeedLog_A_STATUS_OK_Response_Is_Generated() { logServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); + verifyEnteringExitCalled(listAppender); } @Test public void Given_Request_Is_HTTP_PUT_And_Is_Not_Allowed_Then_Forbidden_Response_Is_Generated() throws Exception { logServlet.doPut(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), anyString()); + verifyEnteringExitCalled(listAppender); } @Test public void Given_Request_Is_HTTP_POST_And_Is_Not_Allowed_Then_Forbidden_Response_Is_Generated() throws Exception { logServlet.doPost(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class))); + verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), anyString()); + verifyEnteringExitCalled(listAppender); + } + + @Test + public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish_A_STATUS_OK_Response_Is_Generated() { + when(request.getParameter("type")).thenReturn("pub"); + when(request.getParameter("expiryReason")).thenReturn(null); + logServlet.doGet(request, response); + verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @Test - public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish_A_STATUS_OK_Response_Is_Generated() + public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish_With_Filename_That_exists_A_STATUS_OK_Response_Is_Generated_And_Correct_Value_Returned() throws Exception { when(request.getParameter("type")).thenReturn("pub"); + when(request.getPathInfo()).thenReturn("/1"); + when(request.getParameter("publishId")).thenReturn("ID"); when(request.getParameter("expiryReason")).thenReturn(null); + when(request.getParameter("statusCode")).thenReturn("204"); + when(request.getParameter("filename")).thenReturn("file123"); logServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); + verify(servletOutputStream, times(1)).print("["); + verify(servletOutputStream, times(1)).print(matches("\n\\{\"statusCode\":204,\"publishId\":\"ID\",\"requestURI\":\"URL/file123\",\"sourceIP\":\"172.0.0.8\",\"method\":\"PUT\",\"contentType\":\"application/vnd.dmaap-dr.log-list; version=1.0\",\"endpointId\":\"user\",\"type\":\"pub\",\"date\":\"2050-05-14T1[6-7]:46:04.422Z\",\"contentLength\":100,\"fileName\":\"file123\"}")); + verify(servletOutputStream, times(1)).print("["); + } + + @Test + public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish_With_Filename_That_Doesnt_exist_A_STATUS_OK_Response_Is_Generated_And_Empty_Array_Returned() + throws Exception { + when(request.getParameter("type")).thenReturn("pub"); + when(request.getPathInfo()).thenReturn("/1"); + when(request.getParameter("publishId")).thenReturn("ID"); + when(request.getParameter("expiryReason")).thenReturn(null); + when(request.getParameter("statusCode")).thenReturn("204"); + when(request.getParameter("filename")).thenReturn("file456"); + logServlet.doGet(request, response); + verify(response).setStatus(eq(HttpServletResponse.SC_OK)); + verify(servletOutputStream, times(1)).print("["); + verify(servletOutputStream, times(0)).print(matches("\n\\{\"statusCode\":204,\"publishId\":\"ID\",\"requestURI\":\"URL/file123\",\"sourceIP\":\"172.0.0.8\",\"method\":\"PUT\",\"contentType\":\"application/vnd.dmaap-dr.log-list; version=1.0\",\"endpointId\":\"user\",\"type\":\"pub\",\"date\":\"2050-05-14T1[6-7]:46:04.422Z\",\"contentLength\":100,\"fileName\":\"file123\"}")); + verify(servletOutputStream, times(1)).print("["); } @Test @@ -222,9 +268,9 @@ public class LogServletTest extends DrServletTestBase { when(request.getParameter("publishId")).thenReturn("bad_PublishID"); when(request.getParameter("statusCode")).thenReturn("-1"); when(request.getParameter("expiryReason")).thenReturn("other"); - when(request.getParameter("start")).thenReturn(null); - when(request.getParameter("end")).thenReturn(null); - ServletOutputStream s = mock(ServletOutputStream.class); - when(response.getOutputStream()).thenReturn(s); + when(request.getParameter("start")).thenReturn("2536159564422"); + when(request.getParameter("end")).thenReturn("2536159564422"); + servletOutputStream = mock(ServletOutputStream.class); + when(response.getOutputStream()).thenReturn(servletOutputStream); } } \ No newline at end of file