Polishing

(cherry picked from commit b9a2d0a)

spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -83,7 +83,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	public void readXmlRootElementList() throws Exception {
 		String content = "<list><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></list>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		List<RootElement> result = (List<RootElement>) converter.read(rootElementListType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -96,7 +95,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	public void readXmlRootElementSet() throws Exception {
 		String content = "<set><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></set>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		Set<RootElement> result = (Set<RootElement>) converter.read(rootElementSetType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -109,7 +107,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	public void readXmlTypeList() throws Exception {
 		String content = "<list><foo s=\"1\"/><bar s=\"2\"/></list>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		List<TestType> result = (List<TestType>) converter.read(typeListType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -122,7 +119,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	public void readXmlTypeSet() throws Exception {
 		String content = "<set><foo s=\"1\"/><bar s=\"2\"/></set>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		Set<TestType> result = (Set<TestType>) converter.read(typeSetType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -133,7 +129,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readXmlRootElementExternalEntityDisabled() throws Exception {
-
 		Resource external = new ClassPathResource("external.txt", getClass());
 		String content =  "<!DOCTYPE root [" +
 				"  <!ELEMENT external ANY >\n" +
@@ -142,7 +137,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
 
 		converter = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
-
 			@Override
 			protected XMLInputFactory createXmlInputFactory() {
 				XMLInputFactory inputFactory = super.createXmlInputFactory();
@@ -164,7 +158,6 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readXmlRootElementExternalEntityEnabled() throws Exception {
-
 		Resource external = new ClassPathResource("external.txt", getClass());
 		String content =  "<!DOCTYPE root [" +
 				"  <!ELEMENT external ANY >\n" +

spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.accept;
 
 import java.util.Collections;
@@ -30,10 +31,11 @@ import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Test fixture for {@link ContentNegotiationManagerFactoryBean} tests.
+ *
  * @author Rossen Stoyanchev
  */
 public class ContentNegotiationManagerFactoryBeanTests {
@@ -119,9 +121,7 @@ public class ContentNegotiationManagerFactoryBeanTests {
 		assertEquals(Collections.emptyList(), manager.resolveMediaTypes(this.webRequest));
 	}
 
-	// SPR-10170
-
-	@Test(expected = HttpMediaTypeNotAcceptableException.class)
+	@Test(expected = HttpMediaTypeNotAcceptableException.class)  // SPR-10170
 	public void favorPathWithIgnoreUnknownPathExtensionTurnedOff() throws Exception {
 		this.factoryBean.setFavorPathExtension(true);
 		this.factoryBean.setIgnoreUnknownPathExtensions(false);
@@ -152,9 +152,7 @@ public class ContentNegotiationManagerFactoryBeanTests {
 				manager.resolveMediaTypes(this.webRequest));
 	}
 
-	// SPR-10170
-
-	@Test(expected = HttpMediaTypeNotAcceptableException.class)
+	@Test(expected = HttpMediaTypeNotAcceptableException.class)  // SPR-10170
 	public void favorParameterWithUnknownMediaType() throws HttpMediaTypeNotAcceptableException {
 		this.factoryBean.setFavorParameter(true);
 		this.factoryBean.afterPropertiesSet();
@@ -188,16 +186,12 @@ public class ContentNegotiationManagerFactoryBeanTests {
 				manager.resolveMediaTypes(this.webRequest));
 
 		// SPR-10513
-
 		this.servletRequest.addHeader("Accept", MediaType.ALL_VALUE);
-
 		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
 				manager.resolveMediaTypes(this.webRequest));
 	}
 
-	// SPR-12286
-
-	@Test
+	@Test  // SPR-12286
 	public void setDefaultContentTypeWithStrategy() throws Exception {
 		this.factoryBean.setDefaultContentTypeStrategy(new FixedContentNegotiationStrategy(MediaType.APPLICATION_JSON));
 		this.factoryBean.afterPropertiesSet();