mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.0.x'
This commit is contained in:
commit
48962718d1
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user