Consistently supply test name to @Parameters

This commit is contained in:
Sam Brannen
2015-05-05 14:05:25 +02:00
parent 77937c5b02
commit 572cbb0821
10 changed files with 91 additions and 94 deletions

View File

@@ -16,8 +16,6 @@
package org.springframework.web.context.request;
import static org.junit.Assert.*;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@@ -27,11 +25,14 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
import static org.junit.Assert.*;
/**
* Parameterized tests for ServletWebRequest
* @author Juergen Hoeller
@@ -49,9 +50,10 @@ public class ServletWebRequestHttpMethodsTests {
private ServletWebRequest request;
private String method;
@Parameter
public String method;
@Parameters
@Parameters(name = "{0}")
static public Iterable<Object[]> safeMethods() {
return Arrays.asList(new Object[][] {
{"GET"},
@@ -59,10 +61,6 @@ public class ServletWebRequestHttpMethodsTests {
});
}
public ServletWebRequestHttpMethodsTests(String method) {
this.method = method;
}
@Before
public void setUp() {
dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);