X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-node%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fnode%2FDRNodeCadiFilterTest.java;h=bb367186c07d1303e9a2e7e64627ec90d3ec1627;hb=5a55b790e8afa3131fd5f894e5d1b1e036dc4cd1;hp=f6737b1e478f9bcc4de523f82faa5fb724d67127;hpb=cf112f2d9ff43759a3aef38cb11dbbfc0a050e02;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DRNodeCadiFilterTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DRNodeCadiFilterTest.java
index f6737b1e..bb367186 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DRNodeCadiFilterTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DRNodeCadiFilterTest.java
@@ -1,4 +1,4 @@
-/**-
+/*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
@@ -20,6 +20,17 @@
 
 package org.onap.dmaap.datarouter.node;
 
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,19 +43,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import static org.mockito.Mockito.*;
-
 @SuppressStaticInitializationFor("org.onap.dmaap.datarouter.node.NodeConfigManager")
 @PrepareForTest({CadiFilter.class})
 @RunWith(PowerMockRunner.class)
-public class DRNodeCadiFilterTest
-{
+public class DRNodeCadiFilterTest {
 
     @Mock
     private PropAccess access;
@@ -67,7 +69,8 @@ public class DRNodeCadiFilterTest
     }
 
     @Test
-    public void Given_doFilter_Called_And_Method_Is_GET_And_AAF_DB_Instance_Is_NULL_Then_Chain_doFilter_Called() throws Exception {
+    public void Given_doFilter_Called_And_Method_Is_GET_And_AAF_DB_Instance_Is_NULL_Then_Chain_doFilter_Called()
+            throws Exception {
         PowerMockito.mockStatic(NodeConfigManager.class);
         NodeConfigManager config = mock(NodeConfigManager.class);
 
@@ -75,12 +78,13 @@ public class DRNodeCadiFilterTest
         PowerMockito.when(config.getAafInstance("/other/5")).thenReturn("legacy");
         when(request.getPathInfo()).thenReturn("/publish/5");
         when(request.getMethod()).thenReturn("GET");
-        cadiFilter.doFilter(request,response,chain);
+        cadiFilter.doFilter(request, response, chain);
         verify(chain, times(1)).doFilter(request, response);
     }
 
     @Test
-    public void Given_doFilter_Called_And_Method_Is_GET_And_Path_Includes_Internal_Then_Chain_doFilter_Called() throws Exception {
+    public void Given_doFilter_Called_And_Method_Is_GET_And_Path_Includes_Internal_Then_Chain_doFilter_Called()
+            throws Exception {
         PowerMockito.mockStatic(NodeConfigManager.class);
         NodeConfigManager config = mock(NodeConfigManager.class);
 
@@ -88,12 +92,13 @@ public class DRNodeCadiFilterTest
         PowerMockito.when(config.getAafInstance("/other/5")).thenReturn("legacy");
         when(request.getPathInfo()).thenReturn("/internal/5");
         when(request.getMethod()).thenReturn("GET");
-        cadiFilter.doFilter(request,response,chain);
+        cadiFilter.doFilter(request, response, chain);
         verify(chain, times(1)).doFilter(request, response);
     }
 
     @Test
-    public void Given_doFilter_Called_And_Method_Is_GET_And_AAF_DB_Is_Not_Null_Then_Super_doFilter_Called() throws Exception {
+    public void Given_doFilter_Called_And_Method_Is_GET_And_AAF_DB_Is_Not_Null_Then_Super_doFilter_Called()
+            throws Exception {
         PowerMockito.mockStatic(NodeConfigManager.class);
         NodeConfigManager config = mock(NodeConfigManager.class);
 
@@ -102,20 +107,22 @@ public class DRNodeCadiFilterTest
         when(request.getPathInfo()).thenReturn("/publish/5/fileId");
         when(request.getMethod()).thenReturn("GET");
         PowerMockito.suppress(MemberMatcher.methodsDeclaredIn(CadiFilter.class));
-        cadiFilter.doFilter(request,response,chain);
+        cadiFilter.doFilter(request, response, chain);
         verify(chain, times(0)).doFilter(request, response);
     }
 
     @Test
-    public void Given_getFileid_Called_And_SendError_Fails_Then_Throw_IOException_And_Call_chain_doFilter() throws Exception {
+    public void Given_getFileid_Called_And_SendError_Fails_Then_Throw_IOException_And_Call_chain_doFilter()
+            throws Exception {
         PowerMockito.mockStatic(NodeConfigManager.class);
         NodeConfigManager config = mock(NodeConfigManager.class);
 
         PowerMockito.when(NodeConfigManager.getInstance()).thenReturn(config);
         when(request.getPathInfo()).thenReturn("/publish/5");
         when(request.getMethod()).thenReturn("DELETE");
-        doThrow(new IOException()).when(response).sendError(HttpServletResponse.SC_NOT_FOUND, "Invalid request URI.  Expecting <feed-publishing-url>/<fileid>.  Possible missing fileid.");
-        cadiFilter.doFilter(request,response,chain);
+        doThrow(new IOException()).when(response).sendError(HttpServletResponse.SC_NOT_FOUND,
+                "Invalid request URI.  Expecting <feed-publishing-url>/<fileid>.  Possible missing fileid.");
+        cadiFilter.doFilter(request, response, chain);
         verify(chain, times(1)).doFilter(request, response);
     }
 }