From 1144d7ba5b49bc224262aeee075a878aedb2cbcb Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 29 May 2014 10:58:57 +0400 Subject: [PATCH] extend java-class instead of groovy-class (to migrate to Kotlin) --- .../jps/builders/ModuleClasspathTest.groovy | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/ModuleClasspathTest.groovy b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/ModuleClasspathTest.groovy index 6c33c437cfd7..3431c457f3a8 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/ModuleClasspathTest.groovy +++ b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/ModuleClasspathTest.groovy @@ -14,20 +14,20 @@ * limitations under the License. */ package org.jetbrains.jps.builders + +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.util.io.FileUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.ProjectPaths import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType -import org.jetbrains.jps.builders.rebuild.JpsRebuildTestCase import org.jetbrains.jps.incremental.ModuleBuildTarget /** * @author nik */ -public class ModuleClasspathTest extends JpsRebuildTestCase { +public class ModuleClasspathTest extends JpsBuildTestCase { @Override protected void setUp() { super.setUp() - myModel.getGlobal().getLibraryCollection().findLibrary("1.6").delete() addJdk("1.6", "/jdk.jar") addJdk("1.5", "/jdk15.jar") loadProject("moduleClasspath/moduleClasspath.ipr") @@ -37,6 +37,12 @@ public class ModuleClasspathTest extends JpsRebuildTestCase { return FileUtil.toSystemIndependentName(getTestDataRootPath()) + "/moduleClasspath/moduleClasspath.ipr" } + @Override + protected String getTestDataRootPath() { + char s = '/' + return FileUtil.toCanonicalPath(PathManagerEx.findFileUnderCommunityHome("jps/jps-builders/testData/output").absolutePath, s) + } + public void testSimpleClasspath() { assertClasspath('util', false, ["util/lib/exported.jar", "/jdk15.jar"]) }