root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' 

Closes gh-16642
This commit is contained in:
Andy Wilkinson 2019-04-24 13:57:52 +01:00
parent eb0b852e99 ba0279be14
commit a0999dadb7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java
View File

@ -18,8 +18,10 @@ package org.springframework.boot.autoconfigure.task;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.junit.Test; import org.junit.Test;
@ -66,7 +68,7 @@ public class TaskSchedulingAutoConfigurationTests {
assertThat(context).hasSingleBean(TaskExecutor.class); assertThat(context).hasSingleBean(TaskExecutor.class);
TaskExecutor taskExecutor = context.getBean(TaskExecutor.class); TaskExecutor taskExecutor = context.getBean(TaskExecutor.class);
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
Thread.sleep(15); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(taskExecutor).hasFieldOrPropertyWithValue( assertThat(taskExecutor).hasFieldOrPropertyWithValue(
"waitForTasksToCompleteOnShutdown", true); "waitForTasksToCompleteOnShutdown", true);
assertThat(taskExecutor) assertThat(taskExecutor)
@ -86,7 +88,7 @@ public class TaskSchedulingAutoConfigurationTests {
.run((context) -> { .run((context) -> {
assertThat(context).hasSingleBean(TaskExecutor.class); assertThat(context).hasSingleBean(TaskExecutor.class);
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
Thread.sleep(15); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(bean.threadNames) assertThat(bean.threadNames)
.allMatch((name) -> name.contains("customized-scheduler-")); .allMatch((name) -> name.contains("customized-scheduler-"));
}); });
@ -100,7 +102,7 @@ public class TaskSchedulingAutoConfigurationTests {
assertThat(context.getBean(TaskScheduler.class)) assertThat(context.getBean(TaskScheduler.class))
.isInstanceOf(TestTaskScheduler.class); .isInstanceOf(TestTaskScheduler.class);
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
Thread.sleep(15); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(bean.threadNames).containsExactly("test-1"); assertThat(bean.threadNames).containsExactly("test-1");
}); });
} }
@ -112,7 +114,7 @@ public class TaskSchedulingAutoConfigurationTests {
assertThat(context).doesNotHaveBean(TaskScheduler.class); assertThat(context).doesNotHaveBean(TaskScheduler.class);
assertThat(context).hasSingleBean(ScheduledExecutorService.class); assertThat(context).hasSingleBean(ScheduledExecutorService.class);
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
Thread.sleep(15); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(bean.threadNames) assertThat(bean.threadNames)
.allMatch((name) -> name.contains("pool-")); .allMatch((name) -> name.contains("pool-"));
}); });
@ -124,7 +126,7 @@ public class TaskSchedulingAutoConfigurationTests {
SchedulingConfigurerConfiguration.class).run((context) -> { SchedulingConfigurerConfiguration.class).run((context) -> {
assertThat(context).doesNotHaveBean(TaskScheduler.class); assertThat(context).doesNotHaveBean(TaskScheduler.class);
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
Thread.sleep(15); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(bean.threadNames).containsExactly("test-1"); assertThat(bean.threadNames).containsExactly("test-1");
}); });
} }
@ -192,9 +194,12 @@ public class TaskSchedulingAutoConfigurationTests {
private final Set<String> threadNames = ConcurrentHashMap.newKeySet(); private final Set<String> threadNames = ConcurrentHashMap.newKeySet();
@Scheduled(fixedRate = 10) private final CountDownLatch latch = new CountDownLatch(1);
@Scheduled(fixedRate = 60000)
public void accumulate() { public void accumulate() {
this.threadNames.add(Thread.currentThread().getName()); this.threadNames.add(Thread.currentThread().getName());
this.latch.countDown();
} }
} }