polish

parent 3e7b1969
...@@ -16,18 +16,6 @@ ...@@ -16,18 +16,6 @@
package org.springframework.cloud.netflix.zuul.filters.post; 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.ByteArrayInputStream;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
...@@ -51,6 +39,18 @@ import com.netflix.zuul.constants.ZuulConstants; ...@@ -51,6 +39,18 @@ import com.netflix.zuul.constants.ZuulConstants;
import com.netflix.zuul.context.Debug; import com.netflix.zuul.context.Debug;
import com.netflix.zuul.context.RequestContext; 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 * @author Spencer Gibb
*/ */
...@@ -108,33 +108,33 @@ public class SendResponseFilterTests { ...@@ -108,33 +108,33 @@ public class SendResponseFilterTests {
assertThat("wrong origin content length", contentLength, equalTo("6")); assertThat("wrong origin content length", contentLength, equalTo("6"));
} }
@Test @Test
public void closeResponseOutpusStreamError() throws Exception { public void closeResponseOutpusStreamError() throws Exception {
HttpServletResponse response = mock(HttpServletResponse.class); HttpServletResponse response = mock(HttpServletResponse.class);
RequestContext context = new RequestContext(); RequestContext context = new RequestContext();
context.setRequest(new MockHttpServletRequest()); context.setRequest(new MockHttpServletRequest());
context.setResponse(response); context.setResponse(response);
context.setResponseDataStream(new ByteArrayInputStream("Hello\n".getBytes("UTF-8"))); context.setResponseDataStream(new ByteArrayInputStream("Hello\n".getBytes("UTF-8")));
Closeable zuulResponse = mock(Closeable.class); Closeable zuulResponse = mock(Closeable.class);
context.set("zuulResponse", zuulResponse); context.set("zuulResponse", zuulResponse);
RequestContext.testSetCurrentContext(context); RequestContext.testSetCurrentContext(context);
SendResponseFilter filter = new SendResponseFilter(); SendResponseFilter filter = new SendResponseFilter();
ServletOutputStream zuuloutputstream = mock(ServletOutputStream.class); ServletOutputStream zuuloutputstream = mock(ServletOutputStream.class);
doThrow(new IOException("Response to client closed")).when(zuuloutputstream).write(isA(byte[].class), anyInt(), anyInt()); 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 { try {
filter.run(); filter.run();
} catch (UndeclaredThrowableException ex) { } catch (UndeclaredThrowableException ex) {
assertThat(ex.getUndeclaredThrowable().getMessage(), is("Response to client closed")); 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 { private void runFilter(String characterEncoding, String content, boolean streamContent) throws Exception {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment