root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix failing tests failing when debug logging is on 

Issue: SPR-10048
This commit is contained in:
Rossen Stoyanchev 2012-12-03 14:17:25 -05:00
parent 9643ff3f1d
commit d3c977b54b
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
View File

@ -77,6 +77,7 @@ public class RestTemplateTests {
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -93,6 +94,7 @@ public class RestTemplateTests {
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -108,6 +110,7 @@ public class RestTemplateTests {
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -124,6 +127,7 @@ public class RestTemplateTests {
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -177,6 +181,7 @@ public class RestTemplateTests {
expect(converter.canRead(String.class, textPlain)).andReturn(true);
String expected = "Hello World";
expect(converter.read(String.class, response)).andReturn(expected);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -205,6 +210,7 @@ public class RestTemplateTests {
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
expect(response.getHeaders()).andReturn(responseHeaders).times(2);
expect(converter.canRead(String.class, contentType)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -239,6 +245,7 @@ public class RestTemplateTests {
String expected = "Hello World";
expect(converter.read(String.class, response)).andReturn(expected);
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -260,6 +267,7 @@ public class RestTemplateTests {
expect(errorHandler.hasError(response)).andReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -282,6 +290,7 @@ public class RestTemplateTests {
URI expected = new URI("http://example.com/hotels");
responseHeaders.setLocation(expected);
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -307,6 +316,7 @@ public class RestTemplateTests {
URI expected = new URI("http://example.com/hotels");
responseHeaders.setLocation(expected);
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -335,6 +345,7 @@ public class RestTemplateTests {
URI expected = new URI("http://example.com/hotels");
responseHeaders.setLocation(expected);
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -360,6 +371,7 @@ public class RestTemplateTests {
expect(errorHandler.hasError(response)).andReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -379,6 +391,7 @@ public class RestTemplateTests {
expect(errorHandler.hasError(response)).andReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -409,6 +422,7 @@ public class RestTemplateTests {
Integer expected = 42;
expect(converter.canRead(Integer.class, textPlain)).andReturn(true);
expect(converter.read(Integer.class, response)).andReturn(expected);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -442,6 +456,7 @@ public class RestTemplateTests {
expect(converter.canRead(Integer.class, textPlain)).andReturn(true);
expect(converter.read(Integer.class, response)).andReturn(expected);
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -472,6 +487,7 @@ public class RestTemplateTests {
expect(response.getHeaders()).andReturn(responseHeaders).times(2);
expect(converter.canRead(Integer.class, textPlain)).andReturn(true);
expect(converter.read(Integer.class, response)).andReturn(null);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -500,6 +516,7 @@ public class RestTemplateTests {
expect(converter.canRead(Integer.class, textPlain)).andReturn(true);
expect(converter.read(Integer.class, response)).andReturn(null);
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -520,6 +537,7 @@ public class RestTemplateTests {
converter.write(helloWorld, null, request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -536,6 +554,7 @@ public class RestTemplateTests {
expect(request.getHeaders()).andReturn(requestHeaders);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -550,6 +569,7 @@ public class RestTemplateTests {
expect(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.DELETE)).andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -568,6 +588,7 @@ public class RestTemplateTests {
EnumSet<HttpMethod> expected = EnumSet.of(HttpMethod.GET, HttpMethod.POST);
responseHeaders.setAllow(expected);
expect(response.getHeaders()).andReturn(responseHeaders);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -621,6 +642,7 @@ public class RestTemplateTests {
expect(converter.canRead(Integer.class, MediaType.TEXT_PLAIN)).andReturn(true);
expect(converter.read(Integer.class, response)).andReturn(expected);
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replayMocks();
@ -663,6 +685,7 @@ public class RestTemplateTests {
expect(converter.canRead(intList.getType(), null, MediaType.TEXT_PLAIN)).andReturn(true);
expect(converter.read(intList.getType(), null, response)).andReturn(expected);
expect(response.getStatusCode()).andReturn(HttpStatus.OK);
addLogResponseStatusExpectations(HttpStatus.OK);
response.close();
replay(requestFactory, request, response, errorHandler, converter);
@ -681,6 +704,11 @@ public class RestTemplateTests {
}
private void addLogResponseStatusExpectations(HttpStatus status) throws IOException {
expect(response.getStatusCode()).andReturn(status).times(0, 1);
expect(response.getStatusText()).andReturn(status.getReasonPhrase()).times(0, 1);
}
private void replayMocks() {
replay(requestFactory, request, response, errorHandler, converter);
}

9
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
View File

@ -31,6 +31,8 @@ import static org.junit.Assert.fail;
import java.util.concurrent.Callable;
import javax.servlet.http.HttpServletRequest;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@ -49,10 +51,13 @@ public class WebAsyncManagerTests {
private AsyncWebRequest asyncWebRequest;
private MockHttpServletRequest servletRequest;
@Before
public void setUp() {
this.asyncManager = WebAsyncUtils.getAsyncManager(new MockHttpServletRequest());
this.servletRequest = new MockHttpServletRequest();
this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
this.asyncManager.setTaskExecutor(new SyncTaskExecutor());
this.asyncWebRequest = createStrictMock(AsyncWebRequest.class);
@ -275,6 +280,7 @@ public class WebAsyncManagerTests {
this.asyncWebRequest.addTimeoutHandler(EasyMock.<Runnable>anyObject());
this.asyncWebRequest.addCompletionHandler(EasyMock.<Runnable>anyObject());
this.asyncWebRequest.startAsync();
expect(this.asyncWebRequest.getNativeRequest(HttpServletRequest.class)).andReturn(this.servletRequest).times(0, 1);
replay(this.asyncWebRequest);
@SuppressWarnings("unchecked")
@ -411,6 +417,7 @@ public class WebAsyncManagerTests {
this.asyncWebRequest.addTimeoutHandler((Runnable) notNull());
this.asyncWebRequest.addCompletionHandler((Runnable) notNull());
this.asyncWebRequest.startAsync();
expect(this.asyncWebRequest.getNativeRequest(HttpServletRequest.class)).andReturn(this.servletRequest).times(0, 1);
expect(this.asyncWebRequest.isAsyncComplete()).andReturn(false);
this.asyncWebRequest.dispatch();
replay(this.asyncWebRequest);