UT fixes (cherry picked from commit bc1576da487bb948e8fac5858846e2ae146eb1b2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/1f2e30f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/1f2e30f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/1f2e30f1 Branch: refs/heads/0.8-incubating Commit: 1f2e30f1c21692536d258358a20f8c7351f45839 Parents: 9c8c894 Author: apoorvnaik <[email protected]> Authored: Tue May 30 11:20:52 2017 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Tue May 30 12:10:46 2017 -0700 ---------------------------------------------------------------------- .../atlas/web/filters/AtlasCSRFPreventionFilterTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/1f2e30f1/webapp/src/test/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilterTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilterTest.java index fca2cc5..954364b 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilterTest.java @@ -24,6 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.PrintWriter; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; @@ -42,13 +43,15 @@ public class AtlasCSRFPreventionFilterTest { // Objects to verify interactions based on request HttpServletResponse mockRes = Mockito.mock(HttpServletResponse.class); + PrintWriter mockWriter = Mockito.mock(PrintWriter.class); + Mockito.when(mockRes.getWriter()).thenReturn(mockWriter); FilterChain mockChain = Mockito.mock(FilterChain.class); // Object under test AtlasCSRFPreventionFilter filter = new AtlasCSRFPreventionFilter(); filter.doFilter(mockReq, mockRes, mockChain); - verify(mockRes, atLeastOnce()).sendError(HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE); + verify(mockRes, atLeastOnce()).setStatus(HttpServletResponse.SC_BAD_REQUEST); Mockito.verifyZeroInteractions(mockChain); } @@ -96,6 +99,8 @@ public class AtlasCSRFPreventionFilterTest { // Objects to verify interactions based on request HttpServletResponse mockRes = Mockito.mock(HttpServletResponse.class); + PrintWriter mockWriter = Mockito.mock(PrintWriter.class); + Mockito.when(mockRes.getWriter()).thenReturn(mockWriter); FilterChain mockChain = Mockito.mock(FilterChain.class); // Object under test @@ -137,6 +142,9 @@ public class AtlasCSRFPreventionFilterTest { // Objects to verify interactions based on request HttpServletResponse mockRes = Mockito.mock(HttpServletResponse.class); + PrintWriter mockWriter = Mockito.mock(PrintWriter.class); + Mockito.when(mockRes.getWriter()).thenReturn(mockWriter); + FilterChain mockChain = Mockito.mock(FilterChain.class); // Object under test
