Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2016-07-26 17:15:15 +02:00
parent 7b564b72a1
commit e03dea1d64
193 changed files with 324 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java
View File

@@ -71,7 +71,7 @@ public class CompositeRequestConditionTests {
assertSame(notEmpty, empty.combine(notEmpty));
}
@Test(expected=IllegalArgumentException.class)
@Test(expected = IllegalArgumentException.class)
public void combineDifferentLength() {
CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param1, this.header1);
@@ -130,7 +130,7 @@ public class CompositeRequestConditionTests {
assertEquals(1, empty.compareTo(notEmpty, request));
}
@Test(expected=IllegalArgumentException.class)
@Test(expected = IllegalArgumentException.class)
public void compareDifferentLength() {
CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param1, this.header1);

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
View File

@@ -51,7 +51,7 @@ public class RequestConditionHolderTests {
assertSame(notEmpty, empty.combine(notEmpty));
}
@Test(expected=ClassCastException.class)
@Test(expected = ClassCastException.class)
public void combineIncompatible() {
RequestConditionHolder params = new RequestConditionHolder(new ParamsRequestCondition("name"));
RequestConditionHolder headers = new RequestConditionHolder(new HeadersRequestCondition("name"));
@@ -110,7 +110,7 @@ public class RequestConditionHolderTests {
assertEquals(1, empty.compareTo(notEmpty, request));
}
@Test(expected=ClassCastException.class)
@Test(expected = ClassCastException.class)
public void compareIncompatible() {
RequestConditionHolder params = new RequestConditionHolder(new ParamsRequestCondition("name"));
RequestConditionHolder headers = new RequestConditionHolder(new HeadersRequestCondition("name"));

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
View File

@@ -159,7 +159,7 @@ public class RequestMappingInfoHandlerMappingTests {
// SPR-9603
@Test(expected=HttpMediaTypeNotAcceptableException.class)
@Test(expected = HttpMediaTypeNotAcceptableException.class)
public void getHandlerRequestMethodMatchFalsePositive() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/users");
request.addHeader("Accept", "application/xml");

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
View File

@@ -310,7 +310,7 @@ public class HttpEntityMethodProcessorMockTests {
// SPR-9142
@Test(expected=HttpMediaTypeNotAcceptableException.class)
@Test(expected = HttpMediaTypeNotAcceptableException.class)
public void handleReturnValueNotAcceptableParseError() throws Exception {
ResponseEntity<String> returnValue = new ResponseEntity<>("Body", HttpStatus.ACCEPTED);
servletRequest.addHeader("Accept", "01");

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java
View File

@@ -111,7 +111,7 @@ public class MatrixVariablesMethodArgumentResolverTests {
assertEquals("2013", resolver.resolveArgument(this.paramYear, this.mavContainer, this.webRequest, null));
}
@Test(expected=ServletRequestBindingException.class)
@Test(expected = ServletRequestBindingException.class)
public void resolveArgumentMultipleMatches() throws Exception {
getMatrixVariables("var1").add("colors", "red");
@@ -120,7 +120,7 @@ public class MatrixVariablesMethodArgumentResolverTests {
this.resolver.resolveArgument(this.paramColors, this.mavContainer, this.webRequest, null);
}
@Test(expected=ServletRequestBindingException.class)
@Test(expected = ServletRequestBindingException.class)
public void resolveArgumentRequired() throws Exception {
resolver.resolveArgument(this.paramColors, this.mavContainer, this.webRequest, null);
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
View File

@@ -53,7 +53,7 @@ import static org.junit.Assert.*;
* @author Jeremy Grelle
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public final class OptionsTagTests extends AbstractHtmlElementTagTests {
public class OptionsTagTests extends AbstractHtmlElementTagTests {
private static final String COMMAND_NAME = "testBean";

2
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
View File

@@ -52,7 +52,7 @@ import static org.junit.Assert.*;
* @author Jeremy Grelle
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public final class RadioButtonsTagTests extends AbstractFormTagTests {
public class RadioButtonsTagTests extends AbstractFormTagTests {
private RadioButtonsTag tag;

2
spring-webmvc/src/test/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslatorTests.java
View File

@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
* @author Rick Evans
* @author Juergen Hoeller
*/
public final class DefaultRequestToViewNameTranslatorTests {
public class DefaultRequestToViewNameTranslatorTests {
private static final String VIEW_NAME = "apple";
private static final String EXTENSION = ".html";

2
spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
View File

@@ -113,7 +113,7 @@ public class RedirectViewUriTemplateTests {
assertEquals(url + "/value1/v1/value2?key3=value3", this.response.getRedirectedUrl());
}
@Test(expected=IllegalArgumentException.class)
@Test(expected = IllegalArgumentException.class)
public void uriTemplateNullValue() throws Exception {
new RedirectView("/{foo}").renderMergedOutputModel(new ModelMap(), this.request, this.response);
}