From 8cc4d25d7325d817441ec122a6113122a80af4df Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 27 Mar 2018 14:53:02 +0300 Subject: [PATCH] java tests: locate velocity.jar via project configuration This is required to convert Velocity to repository library. --- .../bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java | 7 ++++--- .../BytecodeAnalysisResultsHighlightingTest.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java index 6654abd50dfd..5cd06e35ae38 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java @@ -10,7 +10,6 @@ import com.intellij.codeInsight.daemon.GutterMark; import com.intellij.codeInspection.bytecodeAnalysis.BytecodeAnalysisConverter; import com.intellij.codeInspection.bytecodeAnalysis.ClassDataIndexer; import com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalysis; -import com.intellij.openapi.application.Result; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Document; @@ -29,6 +28,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileVisitor; +import com.intellij.project.IntelliJProjectConfiguration; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiFormatUtil; @@ -80,8 +80,9 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC } private void setUpLibraries() { - String libDir = PathManagerEx.getCommunityHomePath() + "/lib"; - PsiTestUtil.addLibrary(myModule, "velocity", libDir, new String[]{"/velocity.jar!/"}, ArrayUtil.EMPTY_STRING_ARRAY); + ModuleRootModificationUtil.addModuleLibrary(myModule, "velocity", + IntelliJProjectConfiguration.getProjectLibraryClassesRootUrls("Velocity"), + Collections.emptyList()); } private void setUpExternalUpAnnotations() { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java index ca70eba18c33..d9344a56c8f4 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java @@ -17,10 +17,10 @@ package com.intellij.java.codeInspection.bytecodeAnalysis; import com.intellij.JavaTestUtil; import com.intellij.java.codeInspection.DataFlowInspectionTestCase; -import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.project.IntelliJProjectConfiguration; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; @@ -37,7 +37,7 @@ public class BytecodeAnalysisResultsHighlightingTest extends DataFlowInspectionT @Override public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { super.configureModule(module, model, contentEntry); - PsiTestUtil.addLibrary(module, model, "velocity", PathManagerEx.getCommunityHomePath() + "/lib", "velocity.jar"); + PsiTestUtil.addProjectLibrary(model, "velocity", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("Velocity")); } }; }