From 7237275f5dc2d367fcda84ad6cd2bc770ea56bef Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 10 Feb 2017 10:14:12 -0700 Subject: [PATCH] polish --- .../filters/post/SendResponseFilterTests.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilterTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilterTests.java index b8469ef9..e5389e58 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilterTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilterTests.java @@ -16,18 +16,6 @@ package org.springframework.cloud.netflix.zuul.filters.post; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.X_ZUUL_DEBUG_HEADER; -import static org.hamcrest.Matchers.equalTo; - import java.io.ByteArrayInputStream; import java.io.Closeable; import java.io.IOException; @@ -51,6 +39,18 @@ import com.netflix.zuul.constants.ZuulConstants; import com.netflix.zuul.context.Debug; import com.netflix.zuul.context.RequestContext; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.X_ZUUL_DEBUG_HEADER; + /** * @author Spencer Gibb */ @@ -108,33 +108,33 @@ public class SendResponseFilterTests { assertThat("wrong origin content length", contentLength, equalTo("6")); } - @Test + @Test public void closeResponseOutpusStreamError() throws Exception { - HttpServletResponse response = mock(HttpServletResponse.class); + HttpServletResponse response = mock(HttpServletResponse.class); - RequestContext context = new RequestContext(); - context.setRequest(new MockHttpServletRequest()); - context.setResponse(response); - context.setResponseDataStream(new ByteArrayInputStream("Hello\n".getBytes("UTF-8"))); - Closeable zuulResponse = mock(Closeable.class); - context.set("zuulResponse", zuulResponse); - RequestContext.testSetCurrentContext(context); + RequestContext context = new RequestContext(); + context.setRequest(new MockHttpServletRequest()); + context.setResponse(response); + context.setResponseDataStream(new ByteArrayInputStream("Hello\n".getBytes("UTF-8"))); + Closeable zuulResponse = mock(Closeable.class); + context.set("zuulResponse", zuulResponse); + RequestContext.testSetCurrentContext(context); - SendResponseFilter filter = new SendResponseFilter(); + SendResponseFilter filter = new SendResponseFilter(); - ServletOutputStream zuuloutputstream = mock(ServletOutputStream.class); - doThrow(new IOException("Response to client closed")).when(zuuloutputstream).write(isA(byte[].class), anyInt(), anyInt()); + ServletOutputStream zuuloutputstream = mock(ServletOutputStream.class); + doThrow(new IOException("Response to client closed")).when(zuuloutputstream).write(isA(byte[].class), anyInt(), anyInt()); - when(response.getOutputStream()).thenReturn(zuuloutputstream); + when(response.getOutputStream()).thenReturn(zuuloutputstream); - try { - filter.run(); - } catch (UndeclaredThrowableException ex) { - assertThat(ex.getUndeclaredThrowable().getMessage(), is("Response to client closed")); - } + try { + filter.run(); + } catch (UndeclaredThrowableException ex) { + assertThat(ex.getUndeclaredThrowable().getMessage(), is("Response to client closed")); + } - verify(zuulResponse).close(); - } + verify(zuulResponse).close(); + } private void runFilter(String characterEncoding, String content, boolean streamContent) throws Exception { MockHttpServletResponse response = new MockHttpServletResponse();