From a314fc929eda41008f5467ed89cb6eabb2f97ed0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 23 Mar 2012 20:03:20 +0400 Subject: [PATCH] Extracted AbstractLibrariesTest from LibrariesTest, renamed it to LibrariesWithoutSourcesTest. --- .../libraries/AbstractLibrariesTest.java | 62 +++++++++++++++++++ ....java => LibrariesWithoutSourcesTest.java} | 38 +----------- 2 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java rename idea/tests/org/jetbrains/jet/plugin/libraries/{LibrariesTest.java => LibrariesWithoutSourcesTest.java} (70%) diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java new file mode 100644 index 00000000000..b63385e8d29 --- /dev/null +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.plugin.libraries; + +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.libraries.Library; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.testFramework.PlatformTestCase; +import org.jetbrains.jet.cli.KotlinCompiler; +import org.jetbrains.jet.plugin.PluginTestCaseBase; + +/** + * @author Evgeny Gerashchenko + * @since 3/23/12 + */ +public abstract class AbstractLibrariesTest extends PlatformTestCase { + protected static final String PACKAGE = "testData.libraries"; + protected static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries"; + protected VirtualFile myLibraryDir; + + @Override + protected void setUp() throws Exception { + super.setUp(); + String libraryDir = FileUtil.getTempDirectory(); + KotlinCompiler.ExitCode compilerExec = new KotlinCompiler().exec("-src", TEST_DATA_PATH + "/library", "-output", libraryDir); + assertEquals(KotlinCompiler.ExitCode.OK, compilerExec); + myLibraryDir = LocalFileSystem.getInstance().findFileByPath(libraryDir); + assertNotNull(myLibraryDir); + + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + ModifiableRootModel moduleModel = ModuleRootManager.getInstance(myModule).getModifiableModel(); + + Library.ModifiableModel libraryModel = moduleModel.getModuleLibraryTable().getModifiableModel().createLibrary("myKotlinLib").getModifiableModel(); + libraryModel.addRoot(myLibraryDir, OrderRootType.CLASSES); + libraryModel.commit(); + + moduleModel.commit(); + } + }); + } +} diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java similarity index 70% rename from idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java rename to idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java index 2fc6a4cf04c..095d9ceca0e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java @@ -16,25 +16,15 @@ package org.jetbrains.jet.plugin.libraries; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.roots.ModifiableRootModel; -import com.intellij.openapi.roots.ModuleRootManager; -import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.compiled.ClsElementImpl; import com.intellij.psi.impl.compiled.ClsFileImpl; -import com.intellij.testFramework.PlatformTestCase; -import org.jetbrains.jet.cli.KotlinCompiler; import org.jetbrains.jet.lang.psi.JetDeclaration; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.util.Map; @@ -42,10 +32,7 @@ import java.util.Map; * @author Evgeny Gerashchenko * @since 3/11/12 */ -public class LibrariesTest extends PlatformTestCase { - private static final String PACKAGE = "testData.libraries"; - private static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries"; - private VirtualFile myLibraryDir; +public class LibrariesWithoutSourcesTest extends AbstractLibrariesTest { private VirtualFile myClassFile; public void testAbstractClass() { @@ -144,27 +131,4 @@ public class LibrariesTest extends PlatformTestCase { assertNotNull(classFile); return classFile; } - - @Override - protected void setUp() throws Exception { - super.setUp(); - String libraryDir = FileUtil.getTempDirectory(); - KotlinCompiler.ExitCode compilerExec = new KotlinCompiler().exec("-src", TEST_DATA_PATH + "/library", "-output", libraryDir); - assertEquals(KotlinCompiler.ExitCode.OK, compilerExec); - myLibraryDir = LocalFileSystem.getInstance().findFileByPath(libraryDir); - assertNotNull(myLibraryDir); - - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ModifiableRootModel moduleModel = ModuleRootManager.getInstance(myModule).getModifiableModel(); - - Library.ModifiableModel libraryModel = moduleModel.getModuleLibraryTable().getModifiableModel().createLibrary("myKotlinLib").getModifiableModel(); - libraryModel.addRoot(myLibraryDir, OrderRootType.CLASSES); - libraryModel.commit(); - - moduleModel.commit(); - } - }); - } } \ No newline at end of file