Merge pull request #4476 from izeye/typo-20151114

* pr/4476:
  Polish

Author: philwebb

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

@@ -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");
 	}
 

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

@@ -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();
 	}
 

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

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

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

@@ -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 @@ private class TestGzipInputStreamFactory implements InputStreamFactory {
 		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() {

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

@@ -87,8 +87,8 @@ public void startupWithSpecifiedValues() throws Exception {
 		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 void addServletRegistrationBeanMustNotBeNull() throws Exception {
 	@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 void withSpecificDispatcherTypesEnumSet() throws Exception {
 	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;

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

@@ -65,7 +65,7 @@ public void loadsNullForMissingFile() throws Exception {
 	}
 
 	@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");

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

@@ -334,7 +334,7 @@ public void doFilter(ServletRequest request, ServletResponse response)
 	}
 
 	@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 void responseIsNotCommitedWhenRequestIsAsync() throws Exception {
 	}
 
 	@Test
-	public void responseIsCommitedWhenRequestIsAsyncAndExceptionIsThrown()
+	public void responseIsCommittedWhenRequestIsAsyncAndExceptionIsThrown()
 			throws Exception {
 		this.filter.addErrorPages(new ErrorPage("/error"));
 		this.request.setAsyncStarted(true);
@@ -364,7 +364,7 @@ public void doFilter(ServletRequest request, ServletResponse response)
 	}
 
 	@Test
-	public void responseIsCommitedWhenRequestIsAsyncAndStatusIs400Plus()
+	public void responseIsCommittedWhenRequestIsAsyncAndStatusIs400Plus()
 			throws Exception {
 		this.filter.addErrorPages(new ErrorPage("/error"));
 		this.request.setAsyncStarted(true);
@@ -384,7 +384,7 @@ public void doFilter(ServletRequest request, ServletResponse response)
 	}
 
 	@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 void responseIsNotCommitedDuringAsyncDispatch() throws Exception {
 	}
 
 	@Test
-	public void responseIsCommitedWhenExceptionIsThrownDuringAsyncDispatch()
+	public void responseIsCommittedWhenExceptionIsThrownDuringAsyncDispatch()
 			throws Exception {
 		this.filter.addErrorPages(new ErrorPage("/error"));
 		setUpAsyncDispatch();
@@ -414,7 +414,7 @@ public void doFilter(ServletRequest request, ServletResponse response)
 	}
 
 	@Test
-	public void responseIsCommitedWhenStatusIs400PlusDuringAsyncDispatch()
+	public void responseIsCommittedWhenStatusIs400PlusDuringAsyncDispatch()
 			throws Exception {
 		this.filter.addErrorPages(new ErrorPage("/error"));
 		setUpAsyncDispatch();

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

@@ -43,7 +43,7 @@ public void testSimpleMap() {
 	}
 
 	@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"));