Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include TaskExecutionAutoConfiguration in @WebMvcTest

Browse Source 
Closes gh-14400
This commit is contained in:
LEVI PAUL 2018-09-10 13:33:50 -04:00 committed by Andy Wilkinson
parent ff0ae3b5c0
commit 74891a75bb
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -128,6 +128,7 @@ org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfigurati
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration,\
org.springframework.boot.autoconfigure.jsonb.JsonbAutoConfiguration,\
org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration,\
org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration,\
org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration,\

23
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAutoConfigurationIntegrationTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,9 +23,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration;
import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.importedAutoConfiguration;
@ -34,6 +38,7 @@ import static org.springframework.boot.test.autoconfigure.AutoConfigurationImpor
* Tests for the auto-configuration imported by {@link WebMvcTest}.
*
* @author Andy Wilkinson
* @author Levi Puot Paul
*/
@RunWith(SpringRunner.class)
@WebMvcTest
@ -66,4 +71,20 @@ public class WebMvcTestAutoConfigurationIntegrationTests {
.has(importedAutoConfiguration(ThymeleafAutoConfiguration.class));
}
@Test
public void taskExecutionAutoConfigurationWasImported() {
assertThat(this.applicationContext)
.has(importedAutoConfiguration(TaskExecutionAutoConfiguration.class));
}
@Test
public void asyncTaskExecutorWithApplicationTaskExecutor() {
assertThat(this.applicationContext.getBeansOfType(AsyncTaskExecutor.class))
.hasSize(1);
assertThat(ReflectionTestUtils.getField(
this.applicationContext.getBean(RequestMappingHandlerAdapter.class),
"taskExecutor")).isSameAs(
this.applicationContext.getBean("applicationTaskExecutor"));
}
}