[DMaaP DR] JKD 11 migration

[dmaap/datarouter.git] / datarouter-prov / src / test / java / org / onap / dmaap / datarouter / provisioning / utils / DRProvCadiFilterTest.java

diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilterTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilterTest.java
index 5e24c5a..25df548 100644 (file)
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilterTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilterTest.java
@@ -20,6 +20,19 @@
 \r
 package org.onap.dmaap.datarouter.provisioning.utils;\r
 \r
+import static org.mockito.ArgumentMatchers.anyString;\r
+import static org.mockito.ArgumentMatchers.eq;\r
+import static org.mockito.Mockito.times;\r
+import static org.mockito.Mockito.verify;\r
+import static org.mockito.Mockito.when;\r
+import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;\r
+\r
+import javax.persistence.EntityManager;\r
+import javax.persistence.EntityManagerFactory;\r
+import javax.persistence.Persistence;\r
+import javax.servlet.FilterChain;\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
 import org.junit.Before;\r
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
@@ -30,24 +43,13 @@ import org.onap.aaf.cadi.filter.CadiFilter;
 import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r
 import org.powermock.api.mockito.PowerMockito;\r
 import org.powermock.api.support.membermodification.MemberMatcher;\r
+import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
 \r
-import javax.persistence.EntityManager;\r
-import javax.persistence.EntityManagerFactory;\r
-import javax.persistence.Persistence;\r
-import javax.servlet.FilterChain;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import static org.hamcrest.Matchers.notNullValue;\r
-import static org.mockito.Matchers.argThat;\r
-import static org.mockito.Matchers.eq;\r
-import static org.mockito.Mockito.*;\r
-import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;\r
-\r
 @RunWith(PowerMockRunner.class)\r
 @PrepareForTest({CadiFilter.class})\r
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})\r
 public class DRProvCadiFilterTest {\r
 \r
     @Mock\r
@@ -88,7 +90,7 @@ public class DRProvCadiFilterTest {
         setRequestMocking("PUT", "subs");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
     }\r
 \r
     @Test\r
@@ -114,7 +116,7 @@ public class DRProvCadiFilterTest {
         setRequestMocking("PUT", "feeds");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
     }\r
 \r
     @Test\r
@@ -150,7 +152,7 @@ public class DRProvCadiFilterTest {
         setRequestMocking("POST", "subscribe");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
 \r
     }\r
 \r
@@ -159,7 +161,7 @@ public class DRProvCadiFilterTest {
         setRequestMocking("POST", "subscribe");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
 \r
     }\r
 \r
@@ -169,7 +171,7 @@ public class DRProvCadiFilterTest {
         when(request.getPathInfo()).thenReturn("/2");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString());\r
 \r
     }\r
 \r
@@ -213,7 +215,7 @@ public class DRProvCadiFilterTest {
         when(request.getPathInfo()).thenReturn("/5");\r
 \r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString());\r
 \r
     }\r
 \r
@@ -245,7 +247,7 @@ public class DRProvCadiFilterTest {
             setRequestMocking("PUT", "subs");\r
             when(request.getPathInfo()).thenReturn("5/");\r
             cadiFilter.doFilter(request, response, chain);\r
-            verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+            verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
 \r
     }\r
 \r
@@ -254,7 +256,7 @@ public class DRProvCadiFilterTest {
         setRequestMocking("PUT", "feeds");\r
         when(request.getPathInfo()).thenReturn("//5");\r
         cadiFilter.doFilter(request, response, chain);\r
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));\r
+        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());\r
     }\r
 \r
     private void setRequestMocking(String method, String servletPath)\r