diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 66a32ffdd7..7ec753a273 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,33 +44,49 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.never;
+import static org.mockito.BDDMockito.verify;
 
 /**
  * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
  */
 public class FormHttpMessageConverterTests {
 
+	public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+
 	private FormHttpMessageConverter converter;
 
+
 	@Before
 	public void setUp() {
-		converter = new AllEncompassingFormHttpMessageConverter();
+		this.converter = new AllEncompassingFormHttpMessageConverter();
 	}
 
+
 	@Test
 	public void canRead() {
-		assertTrue(converter.canRead(MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded")));
-		assertFalse(converter.canRead(MultiValueMap.class, new MediaType("multipart", "form-data")));
+		assertTrue(this.converter.canRead(MultiValueMap.class,
+				new MediaType("application", "x-www-form-urlencoded")));
+		assertFalse(this.converter.canRead(MultiValueMap.class,
+				new MediaType("multipart", "form-data")));
 	}
 
 	@Test
 	public void canWrite() {
-		assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded")));
-		assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("multipart", "form-data")));
-		assertTrue(converter.canWrite(MultiValueMap.class, new MediaType("multipart", "form-data", Charset.forName("UTF-8"))));
-		assertTrue(converter.canWrite(MultiValueMap.class, MediaType.ALL));
+		assertTrue(this.converter.canWrite(MultiValueMap.class,
+				new MediaType("application", "x-www-form-urlencoded")));
+		assertTrue(this.converter.canWrite(MultiValueMap.class,
+				new MediaType("multipart", "form-data")));
+		assertTrue(this.converter.canWrite(MultiValueMap.class,
+				new MediaType("multipart", "form-data", Charset.forName("UTF-8"))));
+		assertTrue(this.converter.canWrite(MultiValueMap.class, MediaType.ALL));
 	}
 
 	@Test
@@ -79,7 +95,7 @@ public class FormHttpMessageConverterTests {
 		Charset iso88591 = Charset.forName("ISO-8859-1");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(iso88591));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "x-www-form-urlencoded", iso88591));
-		MultiValueMap<String, String> result = converter.read(null, inputMessage);
+		MultiValueMap<String, String> result = this.converter.read(null, inputMessage);
 
 		assertEquals("Invalid result", 3, result.size());
 		assertEquals("Invalid result", "value 1", result.getFirst("name 1"));
@@ -98,9 +114,10 @@ public class FormHttpMessageConverterTests {
 		body.add("name 2", "value 2+2");
 		body.add("name 3", null);
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		converter.write(body, MediaType.APPLICATION_FORM_URLENCODED, outputMessage);
+		this.converter.write(body, MediaType.APPLICATION_FORM_URLENCODED, outputMessage);
+
 		assertEquals("Invalid result", "name+1=value+1&name+2=value+2%2B1&name+2=value+2%2B2&name+3",
-				outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+				outputMessage.getBodyAsString(UTF_8));
 		assertEquals("Invalid content-type", new MediaType("application", "x-www-form-urlencoded"),
 				outputMessage.getHeaders().getContentType());
 		assertEquals("Invalid content-length", outputMessage.getBodyAsBytes().length,
@@ -119,7 +136,6 @@ public class FormHttpMessageConverterTests {
 		parts.add("logo", logo);
 
 		// SPR-12108
-
 		Resource utf8 = new ClassPathResource("/org/springframework/http/converter/logo.jpg") {
 			@Override
 			public String getFilename() {
@@ -135,8 +151,8 @@ public class FormHttpMessageConverterTests {
 		parts.add("xml", entity);
 
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		converter.setMultipartCharset(Charset.forName("UTF-8"));
-		converter.write(parts, new MediaType("multipart", "form-data", Charset.forName("UTF-8")), outputMessage);
+		this.converter.setMultipartCharset(UTF_8);
+		this.converter.write(parts, new MediaType("multipart", "form-data", UTF_8), outputMessage);
 
 		final MediaType contentType = outputMessage.getHeaders().getContentType();
 		assertNotNull("No boundary found", contentType.getParameter("boundary"));
@@ -144,7 +160,8 @@ public class FormHttpMessageConverterTests {
 		// see if Commons FileUpload can read what we wrote
 		FileItemFactory fileItemFactory = new DiskFileItemFactory();
 		FileUpload fileUpload = new FileUpload(fileItemFactory);
-		List<FileItem> items = fileUpload.parseRequest(new MockHttpOutputMessageRequestContext(outputMessage));
+		RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage);
+		List<FileItem> items = fileUpload.parseRequest(requestContext);
 		assertEquals(6, items.size());
 		FileItem item = items.get(0);
 		assertTrue(item.isFormField());
@@ -181,35 +198,38 @@ public class FormHttpMessageConverterTests {
 		verify(outputMessage.getBody(), never()).close();
 	}
 
+
 	private static class MockHttpOutputMessageRequestContext implements RequestContext {
 
 		private final MockHttpOutputMessage outputMessage;
 
+
 		private MockHttpOutputMessageRequestContext(MockHttpOutputMessage outputMessage) {
 			this.outputMessage = outputMessage;
 		}
 
+
 		@Override
 		public String getCharacterEncoding() {
-			MediaType contentType = outputMessage.getHeaders().getContentType();
-			return contentType != null && contentType.getCharSet() != null ? contentType.getCharSet().name() : null;
+			MediaType type = this.outputMessage.getHeaders().getContentType();
+			return (type != null && type.getCharSet() != null ? type.getCharSet().name() : null);
 		}
 
 		@Override
 		public String getContentType() {
-			MediaType contentType = outputMessage.getHeaders().getContentType();
-			return contentType != null ? contentType.toString() : null;
+			MediaType type = this.outputMessage.getHeaders().getContentType();
+			return (type != null ? type.toString() : null);
 		}
 
 		@Override
 		@Deprecated
 		public int getContentLength() {
-			return outputMessage.getBodyAsBytes().length;
+			return this.outputMessage.getBodyAsBytes().length;
 		}
 
 		@Override
 		public InputStream getInputStream() throws IOException {
-			return new ByteArrayInputStream(outputMessage.getBodyAsBytes());
+			return new ByteArrayInputStream(this.outputMessage.getBodyAsBytes());
 		}
 	}