Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine inner-class test @Configuration detection

Browse Source 
Update detection logic to also consider `@Rules` classes. Also make the
documentation a little clearer.

Fixes gh-6768
This commit is contained in:
Phillip Webb
2016-09-15 16:55:49 -07:00
parent 46815fc483
commit 5f7897ba41
4 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,9 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
*/
class TestTypeExcludeFilter extends TypeExcludeFilter {
private static final String TEST_ANNOTATION = "org.junit.Test";
private static final String[] CLASS_ANNOTATIONS = { "org.junit.runner.RunWith" };
private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test" };
@Override
public boolean match(MetadataReader metadataReader,
@@ -63,8 +65,18 @@ class TestTypeExcludeFilter extends TypeExcludeFilter {
}
private boolean isTestClass(MetadataReader metadataReader) {
return !metadataReader.getAnnotationMetadata()
.getAnnotatedMethods(TEST_ANNOTATION).isEmpty();
for (String annotation : CLASS_ANNOTATIONS) {
if (metadataReader.getAnnotationMetadata().hasAnnotation(annotation)) {
return true;
}
}
for (String annotation : METHOD_ANNOTATIONS) {
if (metadataReader.getAnnotationMetadata().hasAnnotatedMethods(annotation)) {
return true;
}
}
return false;
}
}