root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #4476 from izeye/typo-20151114 

* pr/4476:
  Polish
This commit is contained in:
Phillip Webb 2015-11-13 18:07:40 -08:00
parent 6a05927e4f 1e4f8fdd8e
commit f6b59fb65f
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java
View File

@ -42,12 +42,12 @@ public class TestCommandIntegrationTests {
public CliTester cli = new CliTester("test-samples/");
@Before
public void setup() throws Exception {
public void setUp() throws Exception {
System.setProperty("disableSpringSnapshotRepos", "false");
}
@After
public void teardown() {
public void tearDown() {
System.clearProperty("disableSpringSnapshotRepos");
}

4
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
View File

@ -63,13 +63,13 @@ public class LiveReloadServerTests {
private MonitoredLiveReloadServer server;
@Before
public void setup() throws Exception {
public void setUp() throws Exception {
this.server = new MonitoredLiveReloadServer(this.port);
this.server.start();
}
@After
public void teardown() throws Exception {
public void tearDown() throws Exception {
this.server.stop();
}

2
spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java
View File

@ -66,7 +66,7 @@ public class ConfigurationWarningsApplicationContextInitializerTests {
}
@Test
public void noLogWithoutComponetScanAnnotation() throws Exception {
public void noLogWithoutComponentScanAnnotation() throws Exception {
load(InDefaultPackageWithoutScanConfiguration.class);
assertThat(this.output.toString(), not(containsString(SCAN_WARNING)));
}

6
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -118,7 +118,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
private final HttpClientContext httpClientContext = HttpClientContext.create();
@After
public void teardown() {
public void tearDown() {
if (this.container != null) {
try {
this.container.stop();
@ -866,13 +866,13 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
private final AtomicBoolean requested = new AtomicBoolean(false);
@Override
public InputStream create(InputStream instream) throws IOException {
public InputStream create(InputStream in) throws IOException {
if (this.requested.get()) {
throw new IllegalStateException(
"On deflated InputStream already requested");
}
this.requested.set(true);
return new GZIPInputStream(instream);
return new GZIPInputStream(in);
}
public boolean wasCompressionUsed() {

10
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractFilterRegistrationBeanTests.java
View File

@ -87,8 +87,8 @@ public abstract class AbstractFilterRegistrationBeanTests {
bean.setServletNames(new LinkedHashSet<String>(Arrays.asList("s1", "s2")));
bean.addServletNames("s3");
bean.setServletRegistrationBeans(
Collections.singleton(mockServletRegistation("s4")));
bean.addServletRegistrationBeans(mockServletRegistation("s5"));
Collections.singleton(mockServletRegistration("s4")));
bean.addServletRegistrationBeans(mockServletRegistration("s5"));
bean.setMatchAfter(true);
bean.onStartup(this.servletContext);
verify(this.servletContext).addFilter(eq("test"), getExpectedFilter());
@ -148,9 +148,9 @@ public abstract class AbstractFilterRegistrationBeanTests {
@Test
public void setServletRegistrationBeanReplacesValue() throws Exception {
AbstractFilterRegistrationBean bean = createFilterRegistrationBean(
mockServletRegistation("a"));
mockServletRegistration("a"));
bean.setServletRegistrationBeans(new LinkedHashSet<ServletRegistrationBean>(
Arrays.asList(mockServletRegistation("b"))));
Arrays.asList(mockServletRegistration("b"))));
bean.onStartup(this.servletContext);
verify(this.registration).addMappingForServletNames(
AbstractFilterRegistrationBean.ASYNC_DISPATCHER_TYPES, false, "b");
@ -221,7 +221,7 @@ public abstract class AbstractFilterRegistrationBeanTests {
protected abstract AbstractFilterRegistrationBean createFilterRegistrationBean(
ServletRegistrationBean... servletRegistrationBeans);
protected final ServletRegistrationBean mockServletRegistation(String name) {
protected final ServletRegistrationBean mockServletRegistration(String name) {
ServletRegistrationBean bean = new ServletRegistrationBean();
bean.setName(name);
return bean;

2
spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistenceTests.java
View File

@ -65,7 +65,7 @@ public class FileSessionPersistenceTests {
}
@Test
public void presistAndLoad() throws Exception {
public void persistAndLoad() throws Exception {
Map<String, PersistentSession> sessionData = new LinkedHashMap<String, PersistentSession>();
Map<String, Object> data = new LinkedHashMap<String, Object>();
data.put("spring", "boot");

12
spring-boot/src/test/java/org/springframework/boot/context/web/ErrorPageFilterTests.java
View File

@ -334,7 +334,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsNotCommitedWhenRequestIsAsync() throws Exception {
public void responseIsNotCommittedWhenRequestIsAsync() throws Exception {
this.request.setAsyncStarted(true);
this.filter.doFilter(this.request, this.response, this.chain);
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
@ -344,7 +344,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsCommitedWhenRequestIsAsyncAndExceptionIsThrown()
public void responseIsCommittedWhenRequestIsAsyncAndExceptionIsThrown()
throws Exception {
this.filter.addErrorPages(new ErrorPage("/error"));
this.request.setAsyncStarted(true);
@ -364,7 +364,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsCommitedWhenRequestIsAsyncAndStatusIs400Plus()
public void responseIsCommittedWhenRequestIsAsyncAndStatusIs400Plus()
throws Exception {
this.filter.addErrorPages(new ErrorPage("/error"));
this.request.setAsyncStarted(true);
@ -384,7 +384,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsNotCommitedDuringAsyncDispatch() throws Exception {
public void responseIsNotCommittedDuringAsyncDispatch() throws Exception {
setUpAsyncDispatch();
this.filter.doFilter(this.request, this.response, this.chain);
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
@ -394,7 +394,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsCommitedWhenExceptionIsThrownDuringAsyncDispatch()
public void responseIsCommittedWhenExceptionIsThrownDuringAsyncDispatch()
throws Exception {
this.filter.addErrorPages(new ErrorPage("/error"));
setUpAsyncDispatch();
@ -414,7 +414,7 @@ public class ErrorPageFilterTests {
}
@Test
public void responseIsCommitedWhenStatusIs400PlusDuringAsyncDispatch()
public void responseIsCommittedWhenStatusIs400PlusDuringAsyncDispatch()
throws Exception {
this.filter.addErrorPages(new ErrorPage("/error"));
setUpAsyncDispatch();

2
spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
View File

@ -43,7 +43,7 @@ public abstract class AbstractJsonParserTests {
}
@Test
public void testDoubleValie() {
public void testDoubleValue() {
Map<String, Object> map = this.parser.parseMap("{\"foo\":\"bar\",\"spam\":1.23}");
assertEquals(2, map.size());
assertEquals("bar", map.get("foo"));