MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

detect tests: collect classes by subpackages

Browse Source
This commit is contained in:
Anna Kozlova
2018-01-23 17:10:59 +03:00
parent 6c12ec24bb
commit 15625fcedb
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+15 -18
View File
@@ -89,11 +89,8 @@ public class TestPackage extends TestObject {
PsiPackage aPackage = JavaPsiFacade.getInstance(myProject).findPackage(packageName);
List<PsiClass> classes = new ArrayList<>();
if (aPackage != null) {
PsiDirectory[] directories =
ReadAction.compute(() -> aPackage.getDirectories(GlobalSearchScope.projectScope(myProject).intersectWith(classFilter.getScope())));
for (PsiDirectory directory : directories) {
collectClassesRecursively(directory, classes);
}
collectClassesRecursively(aPackage, GlobalSearchScope.projectScope(myProject).intersectWith(classFilter.getScope()), classes
);
}
classes
.stream()
@@ -122,19 +119,19 @@ public class TestPackage extends TestObject {
}
}
private void collectClassesRecursively(PsiElement root, List<PsiClass> classes) {
PsiElement[] children = ReadAction.compute(() -> root.getChildren());
for (PsiElement child : children) {
if (child instanceof PsiClassOwner) {
for (PsiClass aClass : ReadAction.compute(() -> ((PsiClassOwner)child).getClasses())) {
classes.add(aClass);
if (Registry.is("junit4.accept.inner.classes", true)) {
classes.addAll(ReadAction.compute(() -> JBTreeTraverser.of(PsiClass::getInnerClasses).withRoot(aClass).toList()));
}
}
}
else {
collectClassesRecursively(child, classes);
private void collectClassesRecursively(PsiPackage aPackage,
GlobalSearchScope scope,
List<PsiClass> classes) {
PsiPackage[] psiPackages =
ReadAction.compute(() -> aPackage.getSubPackages(scope));
for (PsiPackage psiPackage : psiPackages) {
collectClassesRecursively(psiPackage, scope, classes);
}
PsiClass[] psiClasses = ReadAction.compute(() -> aPackage.getClasses(scope));
for (PsiClass aClass : psiClasses) {
classes.add(aClass);
if (Registry.is("junit4.accept.inner.classes", true)) {
classes.addAll(ReadAction.compute(() -> JBTreeTraverser.of(PsiClass::getInnerClasses).withRoot(aClass).toList()));
}
}
}