Fix failing tests

Author: rstoyanchev

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

@@ -267,7 +267,7 @@ private void assertContentDisposition(RequestResponseBodyMethodProcessor process
 		String header = servletResponse.getHeader("Content-Disposition");
 		if (expectContentDisposition) {
 			assertEquals("Expected 'Content-Disposition' header. Use case: '" + comment + "'",
-					"attachment;filename=f.txt", header);
+					"inline;filename=f.txt", header);
 		}
 		else {
 			assertNull("Did not expect 'Content-Disposition' header. Use case: '" + comment + "'", header);

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java

@@ -1605,7 +1605,7 @@ public void initialize(GenericWebApplicationContext wac) {
 
 		assertEquals(200, response.getStatus());
 		assertEquals("text/html", response.getContentType());
-		assertEquals("attachment;filename=f.txt", response.getHeader("Content-Disposition"));
+		assertEquals("inline;filename=f.txt", response.getHeader("Content-Disposition"));
 		assertArrayEquals(content, response.getContentAsByteArray());
 	}