From 1a571db7ce00a2cb8e83ffef6bdbfd3437f39c22 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 21 Aug 2017 13:02:03 +0300 Subject: [PATCH] groovy: do not hardcode path to junit.jar Locate it IDEA project configuration instead. If paths to JAR files are hardcoded tests will break when corresponding libraries are converted to repository libraries. --- .../plugins/groovy/compiler/GroovyCompilerTest.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy index 22d3cb85f3a9..e705853db685 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy @@ -40,14 +40,13 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess +import com.intellij.project.IntelliJProjectConfiguration import com.intellij.psi.PsiFile import com.intellij.testFramework.PsiTestUtil import com.intellij.testFramework.TestLoggerFactory import groovy.transform.CompileStatic import org.jetbrains.annotations.NotNull -import org.jetbrains.plugins.groovy.config.GroovyFacetUtil import org.jetbrains.plugins.groovy.lang.psi.GroovyFile - /** * @author peter */ @@ -902,7 +901,7 @@ class AppTest { def anotherModule = addModule("another", true) addGroovyLibrary(anotherModule) - PsiTestUtil.addLibrary(myModule, "junit", GroovyFacetUtil.libDirectory, "junit.jar") + PsiTestUtil.addProjectLibrary(myModule, "junit", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit3")) def cliPath = FileUtil.toCanonicalPath(PluginPathManager.getPluginHomePath("groovy") + "/../../build/lib") PsiTestUtil.addLibrary(myModule, "cli", cliPath, "commons-cli-1.2.jar")