X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPublishServletTest.java;h=e1a11f3ef5ac9c2a262fc871761474d1e0a65e05;hp=92403ac804192f2fa1ce3ae43b00dc783cd9b609;hb=68a9ca240970fceaf12bbe91b7bad8e1d98ecd93;hpb=939b8989a371158b5fd7766d04a820a94f8b96d4 diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java index 92403ac8..e1a11f3e 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java @@ -23,59 +23,75 @@ package org.onap.dmaap.datarouter.provisioning; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; import org.apache.commons.lang3.reflect.FieldUtils; -import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; -import org.onap.dmaap.datarouter.authz.AuthorizationResponse; -import org.onap.dmaap.datarouter.authz.Authorizer; -import org.onap.dmaap.datarouter.provisioning.beans.*; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; +import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils; +import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletOutputStream; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; + + +import java.io.FileNotFoundException; +import java.net.InetAddress; import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.*; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER; +import static org.powermock.api.mockito.PowerMockito.mockStatic; /** * Created by ezcoxem on 21/08/2018. */ @RunWith(PowerMockRunner.class) -@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.provisioning.beans.Feed") +@PrepareForTest({InetAddress.class }) public class PublishServletTest extends DrServletTestBase { private PublishServlet publishServlet; - private static String START_JSON_STRING = "{"; - private static String END_JSON_STRING = "}"; - private static String START_JSON_ARRAY = "["; - private static String END_JSON_ARRAY = "]"; - private static String COMMA = ","; - @Mock private HttpServletRequest request; @Mock private HttpServletResponse response; + private static EntityManagerFactory emf; + private static EntityManager em; + + private ListAppender listAppender; + + @BeforeClass + public static void init() { + emf = Persistence.createEntityManagerFactory("dr-unit-tests"); + em = emf.createEntityManager(); + System.setProperty( + "org.onap.dmaap.datarouter.provserver.properties", + "src/test/resources/h2Database.properties"); + } + + @AfterClass + public static void tearDownClass() throws FileNotFoundException { + em.clear(); + em.close(); + emf.close(); + } + + @Before public void setUp() throws Exception { - super.setUp(); + listAppender = setTestLogger(PublishServlet.class); publishServlet = new PublishServlet(); + ProvDbUtils.getInstance().initProvDB(); } @Test @@ -84,12 +100,13 @@ public class PublishServletTest extends DrServletTestBase { FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[0], true); publishServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_SERVICE_UNAVAILABLE), argThat(notNullValue(String.class))); + FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); + verifyEnteringExitCalled(listAppender); } @Test public void Given_Request_Is_HTTP_DELETE_And_Path_Is_Null_Then_Not_Found_Error_Is_Returned() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); publishServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -97,8 +114,8 @@ public class PublishServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_Ix_Is_Null_Then_Not_Found_Error_Is_Returned() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); - when(request.getPathInfo()).thenReturn("/123/"); + + when(request.getPathInfo()).thenReturn("/1/"); publishServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -106,10 +123,7 @@ public class PublishServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_Feed_Is_Not_Valid_Then_Not_Found_Error_Is_Returned() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); - when(request.getPathInfo()).thenReturn("/123/fileName.txt"); - PowerMockito.mockStatic(Feed.class); - PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(false); + when(request.getPathInfo()).thenReturn("/122/fileName.txt"); publishServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -117,10 +131,7 @@ public class PublishServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_Feed_Is_Not_A_Number_Then_Not_Found_Error_Is_Returned() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); when(request.getPathInfo()).thenReturn("/abc/fileName.txt"); - PowerMockito.mockStatic(Feed.class); - PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(false); publishServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -129,10 +140,11 @@ public class PublishServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_All_Ok_Then_Request_succeeds() throws Exception { - setConditionsForPositiveSuccessFlow(); when(request.getHeader(anyString())).thenReturn("Basic dXNlcg=="); + setConditionsForPositiveSuccessFlow(); publishServlet.doDelete(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY)); + verifyEnteringExitCalled(listAppender); } @Test @@ -142,6 +154,7 @@ public class PublishServletTest extends DrServletTestBase { publishServlet.doPut(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY)); + verifyEnteringExitCalled(listAppender); } @Test @@ -151,64 +164,39 @@ public class PublishServletTest extends DrServletTestBase { publishServlet.doPost(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY)); + verifyEnteringExitCalled(listAppender); } @Test - public void Given_Request_Is_HTTP_GET_And_Request_succeeds() + public void Given_Request_Is_HTTP_GET_And_Request_succeeds_And_RequestId_Header_is_empty() throws Exception { setConditionsForPositiveSuccessFlow(); + mockStatic(InetAddress.class); + publishServlet.doGet(request, response); + verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY)); + verifyEnteringExitCalled(listAppender); + assertEquals(null, listAppender.list.get(0).getMDCPropertyMap().get("RequestId")); + assertEquals(null, listAppender.list.get(0).getMDCPropertyMap().get("InvocationId")); + } + @Test + public void Given_Request_Is_HTTP_GET_And_Request_succeeds_And_RequestId_Header_Is_Not_Empty() + throws Exception { + setConditionsForPositiveSuccessFlow(); + when(request.getHeader("X-ONAP-RequestID")).thenReturn("123"); + when(request.getHeader("X-InvocationID")).thenReturn("456"); publishServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY)); + verifyEnteringExitCalled(listAppender); + assertEquals("123", listAppender.list.get(0).getMDCPropertyMap().get("RequestId")); + assertEquals("456", listAppender.list.get(0).getMDCPropertyMap().get("InvocationId")); } private void setConditionsForPositiveSuccessFlow() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true); - FieldUtils.writeDeclaredField(publishServlet, "next_node", 0, true); FieldUtils.writeDeclaredField(publishServlet, "provstring", "", true); - FieldUtils.writeDeclaredField(publishServlet, "irt", new ArrayList(), true); - FieldUtils.writeDeclaredStaticField(NodeClass.class, "map", new HashMap(), true); - when(request.getPathInfo()).thenReturn("/123/fileName.txt"); - PowerMockito.mockStatic(Feed.class); - PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(true); - setPokerToNotCreateTimersWhenDeleteFeedIsCalled(); - } - - private void setPokerToNotCreateTimersWhenDeleteFeedIsCalled() throws Exception { - Poker poker = mock(Poker.class); - FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true); - when(poker.getProvisioningString()).thenReturn(buildProvisioningString()); + when(request.getPathInfo()).thenReturn("/1/fileName.txt"); } - private String buildProvisioningString(){ - StringBuffer provisionString = new StringBuffer(); - provisionString.append(START_JSON_STRING); - provisionString.append("'ingress':"); - provisionString.append(START_JSON_ARRAY); - provisionString.append(buildIngressRoute()); - provisionString.append(END_JSON_ARRAY); - provisionString.append(END_JSON_STRING); - return provisionString.toString(); - } - - private StringBuffer buildIngressRoute(){ - StringBuffer provisionString = new StringBuffer(); - provisionString.append(START_JSON_STRING); - provisionString.append("'seq':1"); - provisionString.append(COMMA); - provisionString.append("'feedid':123"); - provisionString.append(COMMA); - provisionString.append("'user':'user'"); - provisionString.append(COMMA); - provisionString.append("'subnet':'127.0.0.1'"); - provisionString.append(COMMA); - provisionString.append("'nodelist':-1"); - provisionString.append(COMMA); - provisionString.append("'node':['1','2']"); - provisionString.append(END_JSON_STRING); - return provisionString; - } - }