Merge pull request #13776 from izeye:polish-20180715

* pr/13776:
  Polish

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfigurationTests.java

@@ -60,7 +60,7 @@ public class JndiConnectionFactoryAutoConfigurationTests {
 	}
 
 	@After
-	public void close() {
+	public void cleanUp() {
 		TestableInitialContextFactory.clearAll();
 		if (this.initialContextFactory != null) {
 			System.setProperty(Context.INITIAL_CONTEXT_FACTORY,

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java

@@ -75,7 +75,7 @@ public class UndertowWebServerFactoryCustomizerTests {
 	}
 
 	@Test
-	public void deduceUseForwardHeadersUndertow() {
+	public void deduceUseForwardHeaders() {
 		this.environment.setProperty("DYNO", "-");
 		ConfigurableUndertowWebServerFactory factory = mock(
 				ConfigurableUndertowWebServerFactory.class);
@@ -84,7 +84,7 @@ public class UndertowWebServerFactoryCustomizerTests {
 	}
 
 	@Test
-	public void defaultUseForwardHeadersUndertow() {
+	public void defaultUseForwardHeaders() {
 		ConfigurableUndertowWebServerFactory factory = mock(
 				ConfigurableUndertowWebServerFactory.class);
 		this.customizer.customize(factory);
@@ -92,7 +92,7 @@ public class UndertowWebServerFactoryCustomizerTests {
 	}
 
 	@Test
-	public void setUseForwardHeadersUndertow() {
+	public void setUseForwardHeaders() {
 		this.serverProperties.setUseForwardHeaders(true);
 		ConfigurableUndertowWebServerFactory factory = mock(
 				ConfigurableUndertowWebServerFactory.class);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java

@@ -149,10 +149,11 @@ public class FileSystemWatcherTests {
 		this.watcher.addSourceFolder(folder);
 		this.watcher.start();
 		folder.mkdirs();
-		touch(new File(folder, "text.txt"));
+		File file = touch(new File(folder, "text.txt"));
 		this.watcher.stopAfter(1);
 		ChangedFiles changedFiles = getSingleChangedFiles();
-		System.out.println(changedFiles);
+		ChangedFile expected = new ChangedFile(folder, file, Type.ADD);
+		assertThat(changedFiles.getFiles()).contains(expected);
 	}
 
 	@Test

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/Slf4JLoggingSystem.java

@@ -75,6 +75,11 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
 		}
 	}
 
+	/**
+	 * Return whether bridging JUL into SLF4J or not.
+	 * @return whether bridging JUL into SLF4J or not
+	 * @since 2.0.4
+	 */
 	protected final boolean isBridgeJulIntoSlf4j() {
 		return isBridgeHandlerAvailable() && isJulUsingItsDefaultConfiguration();
 	}

spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java

@@ -63,7 +63,8 @@ public class SampleWebJspApplicationTests {
 				URI.create("/foo"));
 		ResponseEntity<String> entity = this.restTemplate.exchange(request, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
-		assertThat(entity.getBody()).contains("Something went wrong");
+		assertThat(entity.getBody())
+				.contains("Something went wrong: 500 Internal Server Error");
 	}
 
 }