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%2FStatisticsServletTest.java;h=1fe8d9b1e3645187e5c35dac998180e25b909481;hp=f9fcd687ea4d2f365733eb08e8f6887cf20584a9;hb=8552e04175c7091d0d748e0c0f4b14a0d9321b40;hpb=3d3b9def088b171329dc47fd7a1c471d25aafc06 diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java index f9fcd687..1fe8d9b1 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java @@ -22,9 +22,8 @@ ******************************************************************************/ package org.onap.dmaap.datarouter.provisioning; -import static org.hamcrest.Matchers.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.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -41,9 +40,11 @@ import org.junit.BeforeClass; 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; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*"}) public class StatisticsServletTest { private StatisticsServlet statisticsServlet; @@ -84,7 +85,7 @@ public class StatisticsServletTest { throws Exception { statisticsServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), - argThat(notNullValue(String.class))); + anyString()); } @Test @@ -92,7 +93,7 @@ public class StatisticsServletTest { throws Exception { statisticsServlet.doPut(request, response); verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), - argThat(notNullValue(String.class))); + anyString()); } @Test @@ -100,7 +101,7 @@ public class StatisticsServletTest { throws Exception { statisticsServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), - argThat(notNullValue(String.class))); + anyString()); } @Test @@ -109,7 +110,7 @@ public class StatisticsServletTest { when(request.getParameter("type")).thenReturn("get"); statisticsServlet.doGet(request, response); verify(response) - .sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); + .sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString()); } @Test