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

Fix rebase from master

This commit is contained in:
Stephane Nicoll 2019-09-16 09:50:58 +02:00
parent ece29bbdfc
commit 9065c4997d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java
View File

@ -33,8 +33,7 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
class TestTypeExcludeFilter extends TypeExcludeFilter {
private static final String[] CLASS_ANNOTATIONS = { "org.junit.runner.RunWith",
"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable",
"org.testng.annotations.Test", };
"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable" };
private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test",
"org.junit.platform.commons.annotation.Testable" };

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java
View File

@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
@Testable
public abstract class AbstractJupiterTestWithConfigAndTestable {
@Configuration(proxyBeanMethods = false)
@Configuration
static class Config {
}