mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fix rebase from master
This commit is contained in:
parent
ece29bbdfc
commit
9065c4997d
@ -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" };
|
||||
|
@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
|
||||
@Testable
|
||||
public abstract class AbstractJupiterTestWithConfigAndTestable {
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user