From aa8c4fc6b72237bf10ebbe62c79502f38f228ca8 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 16 Dec 2014 12:00:35 +0300 Subject: [PATCH] compilation tests: cleanup --- .../com/intellij/compiler/BaseCompilerTestCase.java | 1 - .../src/com/intellij/compiler/CompilerTestUtil.java | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java index a59768c07bf2..15e9c44a01cf 100644 --- a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java +++ b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java @@ -265,7 +265,6 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase { }; myProject.save(); CompilerTestUtil.saveApplicationSettings(); - CompilerTestUtil.scanSourceRootsToRecompile(myProject); action.run(callback); } }); diff --git a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java index 693337fff592..aac45eac8e03 100644 --- a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java +++ b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java @@ -19,7 +19,6 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.NamedJDOMExternalizable; @@ -32,7 +31,6 @@ import com.intellij.util.SystemProperties; import junit.framework.AssertionFailedError; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes; import org.jetbrains.jps.model.serialization.JDomSerializationUtil; import org.junit.Assert; @@ -55,11 +53,10 @@ public class CompilerTestUtil { compilerConfiguration.setDefaultCompiler(compilerConfiguration.getJavacCompiler()); } + /** + * @deprecated not needed anymore + */ public static void scanSourceRootsToRecompile(Project project) { - // need this to emulate project opening - final List roots = ProjectRootManager.getInstance(project).getModuleSourceRoots(JavaModuleSourceRootTypes.SOURCES); - // todo: forced source roots scan is not needed? - //TranslatingCompilerFilesMonitor.getInstance().scanSourceContent(new TranslatingCompilerFilesMonitor.ProjectRef(project), roots, roots.size(), true); } public static void saveApplicationSettings() {