X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-subscriber%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fsubscriber%2FSampleSubscriberServletTest.java;h=bab9d01172e384da06bcbbddf33e33b9e211bab2;hb=bda6aeaa60607ab4fe5af508156019d7bd5c0ce4;hp=e31b34738199363e5a067b2e2d5ca231408184d4;hpb=fb6bfe73b73a2eeb543883d0da14e301e0066aa2;p=dmaap%2Fdatarouter.git diff --git a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java index e31b3473..bab9d011 100755 --- a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java +++ b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java @@ -22,17 +22,18 @@ ******************************************************************************/ package org.onap.dmaap.datarouter.subscriber; +import jakarta.servlet.ServletInputStream; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; 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.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; @@ -40,6 +41,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*"}) public class SampleSubscriberServletTest { private SampleSubscriberServlet sampleSubServlet; @@ -99,7 +101,8 @@ public class SampleSubscriberServletTest { private void setUpSuccessfulFlow() throws IOException { when(request.getHeader("Authorization")).thenReturn("Basic TE9HSU46UEFTU1dPUkQ="); when(request.getPathInfo()).thenReturn("/publish/1/testfile"); - when(request.getHeader("X-ATT-DR-PUBLISH-ID")).thenReturn("1"); + when(request.getHeader("X-DMAAP-DR-PUBLISH-ID")).thenReturn("1"); + when(request.getHeader("X-DMAAP-DR-META")).thenReturn("{\"Key\":\"Value\"}"); when(request.getQueryString()).thenReturn(null); ServletInputStream inStream = mock(ServletInputStream.class); when(request.getInputStream()).thenReturn(inStream);