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

tests: enable pattern configuration by set of packages (IDEA-205512)

Browse Source
This commit is contained in:
Anna.Kozlova
2019-01-18 20:31:39 +01:00
parent d5074c759c
commit 489e6f374e
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java
+30 -28
View File
@@ -135,40 +135,42 @@ public abstract class AbstractJavaTestConfigurationProducer<T extends JavaTestCo
boolean checkIsTest,
PsiElementProcessor.CollectElements<PsiElement> collectingProcessor) {
for (PsiElement psiElement : psiElements) {
psiElement = PsiTreeUtil.getParentOfType(psiElement, PsiMember.class, false);
if (psiElement instanceof PsiClassOwner) {
final PsiClass[] classes = ((PsiClassOwner)psiElement).getClasses();
for (PsiClass aClass : classes) {
if ((!checkIsTest && isRequiredVisibility(aClass) || checkIsTest && isTestClass(aClass)) &&
!collectingProcessor.execute(aClass)) {
return;
if (psiElement instanceof PsiDirectory) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)psiElement);
if (aPackage != null && !collectingProcessor.execute(aPackage)) {
return;
}
}
else {
psiElement = PsiTreeUtil.getParentOfType(psiElement, PsiMember.class, false);
if (psiElement instanceof PsiClassOwner) {
final PsiClass[] classes = ((PsiClassOwner)psiElement).getClasses();
for (PsiClass aClass : classes) {
if ((!checkIsTest && isRequiredVisibility(aClass) || checkIsTest && isTestClass(aClass)) &&
!collectingProcessor.execute(aClass)) {
return;
}
}
}
}
else if (psiElement instanceof PsiClass) {
if ((!checkIsTest && isRequiredVisibility((PsiClass)psiElement) ||
checkIsTest && isTestClass((PsiClass)psiElement)) &&
!collectingProcessor.execute(psiElement)) {
return;
}
}
else if (psiElement instanceof PsiMethod) {
if (checkIsTest && isTestMethod(checkAbstract, (PsiMethod)psiElement) && !collectingProcessor.execute(psiElement)) {
return;
}
if (!checkIsTest) {
final PsiClass containingClass = ((PsiMethod)psiElement).getContainingClass();
if (containingClass != null &&
isRequiredVisibility(containingClass) &&
else if (psiElement instanceof PsiClass) {
if ((!checkIsTest && isRequiredVisibility((PsiClass)psiElement) ||
checkIsTest && isTestClass((PsiClass)psiElement)) &&
!collectingProcessor.execute(psiElement)) {
return;
}
}
}
else if (psiElement instanceof PsiDirectory) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)psiElement);
if (aPackage != null && !collectingProcessor.execute(aPackage)) {
return;
else if (psiElement instanceof PsiMethod) {
if (checkIsTest && isTestMethod(checkAbstract, (PsiMethod)psiElement) && !collectingProcessor.execute(psiElement)) {
return;
}
if (!checkIsTest) {
final PsiClass containingClass = ((PsiMethod)psiElement).getContainingClass();
if (containingClass != null &&
isRequiredVisibility(containingClass) &&
!collectingProcessor.execute(psiElement)) {
return;
}
}
}
}
}