From 6e4b81e65c72ef55f7093027c82b7c80f94dadcf Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Mon, 23 Sep 2013 17:26:32 +0400 Subject: [PATCH] EA-50137 - assert: TestObject.addClassesListToJavaParameters --- .../impl/src/com/intellij/execution/junit/JUnitUtil.java | 1 + .../src/com/intellij/execution/junit/TestClassFilter.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index ae4ea8819b25..74524ca8ae14 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -99,6 +99,7 @@ public class JUnitUtil { } public static boolean isTestClass(@NotNull PsiClass psiClass, boolean checkAbstract, boolean checkForTestCaseInheritance) { + if (psiClass.getQualifiedName() == null) return false; if (!PsiClassUtil.isRunnableClass(psiClass, true, checkAbstract)) return false; if (checkForTestCaseInheritance && isTestCaseInheritor(psiClass)) return true; final PsiModifierList modifierList = psiClass.getModifierList(); diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java b/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java index 84b5e3b91976..cc58990a7aa6 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestClassFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import com.intellij.openapi.util.Computable; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.PsiUtilBase; import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; @@ -55,7 +54,8 @@ public class TestClassFilter implements ClassFilter.ClassFilterWithScope { return ApplicationManager.getApplication().runReadAction(new Computable() { @Override public Boolean compute() { - return ConfigurationUtil.PUBLIC_INSTANTIATABLE_CLASS.value(aClass) && + return aClass.getQualifiedName() != null && + ConfigurationUtil.PUBLIC_INSTANTIATABLE_CLASS.value(aClass) && (aClass.isInheritor(myBase, true) || JUnitUtil.isTestClass(aClass)) && !CompilerConfiguration.getInstance(getProject()).isExcludedFromCompilation(PsiUtilCore.getVirtualFile(aClass)); }