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

fix tests for GlobalSimpleInspectionTool running concurrently

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-04-05 17:54:06 +04:00
parent 3e532eec44
commit 665cd6c3e0
9 changed files with 114 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
+6 -23
View File
@@ -20,9 +20,9 @@ import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.GlobalInspectionTool;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.reference.EntryPoint;
import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
import com.intellij.codeInspection.ex.*;
import com.intellij.codeInspection.reference.EntryPoint;
import com.intellij.codeInspection.reference.RefElement;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.PathManagerEx;
@@ -42,6 +42,7 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.util.PsiUtil;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -118,14 +119,11 @@ public abstract class InspectionTestCase extends PsiTestCase {
});
AnalysisScope scope = createAnalysisScope(sourceDir[0].getParent());
InspectionManagerEx inspectionManager = (InspectionManagerEx) InspectionManager.getInstance(myProject);
final GlobalInspectionContextImpl globalContext = inspectionManager.createNewGlobalContext(true);
globalContext.setCurrentScope(scope);
InspectionManagerEx inspectionManager = (InspectionManagerEx) InspectionManager.getInstance(getProject());
InspectionTool[] tools = runDeadCodeFirst ? new InspectionTool[]{new UnusedDeclarationInspection(), tool} : new InspectionTool[]{tool};
final GlobalInspectionContextImpl globalContext = CodeInsightTestFixtureImpl.createGlobalContextForTool(scope, getProject(), inspectionManager, tools);
if (runDeadCodeFirst) {
runTool(new UnusedDeclarationInspection(), scope, globalContext, inspectionManager);
}
runTool(tool, scope, globalContext, inspectionManager);
InspectionTestUtil.runTool(tool, scope, globalContext, inspectionManager);
}
protected AnalysisScope createAnalysisScope(VirtualFile sourceDir) {
@@ -133,21 +131,6 @@ public abstract class InspectionTestCase extends PsiTestCase {
return new AnalysisScope(psiManager.findDirectory(sourceDir));
}
private static void runTool(final InspectionTool tool,
final AnalysisScope scope,
final GlobalInspectionContextImpl globalContext,
final InspectionManagerEx inspectionManager) {
InspectionTestUtil.runTool(tool, scope, globalContext, inspectionManager);
final GlobalJavaInspectionContextImpl javaInspectionContext =
(GlobalJavaInspectionContextImpl)globalContext.getExtension(GlobalJavaInspectionContextImpl.CONTEXT);
if (javaInspectionContext != null) {
do {
javaInspectionContext.processSearchRequests(globalContext);
} while (tool.queryExternalUsagesRequests(inspectionManager));
}
}
protected void setupRootModel(final String testDir, final VirtualFile[] sourceDir, final String sdkName) {
VirtualFile projectDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(testDir));
assertNotNull("could not find project dir " + testDir, projectDir);