Merge branch '2.1.x'

Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
2799 changed files with 28402 additions and 47836 deletions

View File

@@ -36,11 +36,9 @@ class SampleQuartzApplicationTests {
@Test
void quartzJobIsTriggered(CapturedOutput capturedOutput) throws InterruptedException {
try (ConfigurableApplicationContext context = SpringApplication
.run(SampleQuartzApplication.class)) {
try (ConfigurableApplicationContext context = SpringApplication.run(SampleQuartzApplication.class)) {
long end = System.currentTimeMillis() + 5000;
while ((!capturedOutput.toString().contains("Hello World!"))
&& System.currentTimeMillis() < end) {
while ((!capturedOutput.toString().contains("Hello World!")) && System.currentTimeMillis() < end) {
Thread.sleep(100);
}
assertThat(capturedOutput).contains("Hello World!");