Polish web containers stop contribution

See gh-8227

Author: philwebb

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

@@ -170,6 +170,16 @@ public void startCalledTwice() throws Exception {
 		assertThat(this.output.toString()).containsOnlyOnce("started on port");
 	}
 
+	@Test
+	public void stopCalledTwice() throws Exception {
+		AbstractEmbeddedServletContainerFactory factory = getFactory();
+		this.container = factory
+				.getEmbeddedServletContainer(exampleServletRegistration());
+		this.container.start();
+		this.container.stop();
+		this.container.stop();
+	}
+
 	@Test
 	public void emptyServerWhenPortIsMinusOne() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
@@ -311,16 +321,6 @@ public void contextRootPathMustNotBeSlash() throws Exception {
 		getFactory().setContextPath("/");
 	}
 
-	@Test
-	public void doubleStop() throws Exception {
-		AbstractEmbeddedServletContainerFactory factory = getFactory();
-		this.container = factory
-				.getEmbeddedServletContainer(exampleServletRegistration());
-		this.container.start();
-		this.container.stop();
-		this.container.stop();
-	}
-
 	@Test
 	public void multipleConfigurations() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();

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

@@ -144,7 +144,7 @@ public void sslCiphersConfiguration() throws Exception {
 	}
 
 	@Test
-	public void stopNoStart() throws Exception {
+	public void stopCalledWithoutStart() throws Exception {
 		JettyEmbeddedServletContainerFactory factory = getFactory();
 		this.container = factory
 				.getEmbeddedServletContainer(exampleServletRegistration());

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

@@ -353,7 +353,7 @@ public void startupFailureDoesNotResultInUnstoppedThreadsBeingReported()
 	}
 
 	@Test
-	public void stopNoStart() throws Exception {
+	public void stopCalledWithoutStart() throws Exception {
 		TomcatEmbeddedServletContainerFactory factory = getFactory();
 		this.container = factory
 				.getEmbeddedServletContainer(exampleServletRegistration());