Merge branch '2.1.x'

Closes gh-18234
This commit is contained in:
Stephane Nicoll
2019-09-16 10:03:19 +02:00
3 changed files with 39 additions and 1 deletions

View File

@@ -33,7 +33,8 @@ 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.testng.annotations.Test" };
"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable",
"org.testng.annotations.Test" };
private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test",
"org.junit.platform.commons.annotation.Testable", "org.testng.annotations.Test" };