From 2337042d83bbd0a88d434360f0a1d5d2be3830f7 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 4 Apr 2014 12:01:21 +0400 Subject: [PATCH] Add kotlin-runtime as library, not only to classpath --- .../debugger/KotlinDebuggerTestCase.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 5f3727b4242..00697c37b30 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -19,12 +19,18 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.debugger.DebuggerTestCase; import com.intellij.debugger.impl.OutputChecker; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.openapi.roots.ModuleRootManager; +import com.intellij.openapi.roots.OrderRootType; +import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VfsUtil; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.jet.asJava.KotlinLightClassForPackage; @@ -33,6 +39,8 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription; +import org.jetbrains.jet.testing.ConfigLibraryUtil; import java.io.File; @@ -52,6 +60,32 @@ public abstract class KotlinDebuggerTestCase extends DebuggerTestCase { return TINY_APP; } + @Override + protected void setUp() throws Exception { + super.setUp(); + + UsefulTestCase.edt(new Runnable() { + @Override + public void run() { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + ModifiableRootModel model = ModuleRootManager.getInstance(getModule()).getModifiableModel(); + + NewLibraryEditor editor = new NewLibraryEditor(); + editor.setName(JavaRuntimeLibraryDescription.LIBRARY_NAME); + editor.addRoot(VfsUtil.getUrlForLibraryRoot(ForTestCompileRuntime.runtimeJarForTests()), OrderRootType.CLASSES); + + ConfigLibraryUtil.addLibrary(editor, model); + + model.commit(); + } + }); + } + }); + + } + @Override public void tearDown() throws Exception { super.tearDown();