azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop JetTestCaseBuilder, move methods to JetTestUtils

Browse Source
This commit is contained in:
Alexander Udalov
2015-01-13 13:04:06 +03:00
parent edf054ddf3
commit 053b5a7700
35 changed files with 86 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
+1 -2
View File
@@ -23,7 +23,6 @@ import com.siyeh.ig.bugs.StaticCallOnSubclassInspection;
import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection;
import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
import org.jetbrains.kotlin.idea.PluginTestCaseBase;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
@Override
@@ -42,7 +41,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
@Override
protected String getTestDataPath() {
return JetTestCaseBuilder.getHomeDirectory() + "/idea/testData/kotlinAndJavaChecker/";
return PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/";
}
public void testName() throws Exception {
idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java
+3 -3
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.utils.UtilsPackage;
import java.io.File;
@@ -50,7 +50,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
protected void setUp() throws Exception {
super.setUp();
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
kotlinInternalModeOriginalValue = KotlinInternalMode.OBJECT$.getEnabled();
KotlinInternalMode.OBJECT$.setEnabled(true);
@@ -59,7 +59,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
@Override
protected void tearDown() throws Exception {
KotlinInternalMode.OBJECT$.setEnabled(kotlinInternalModeOriginalValue);
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
}
idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
import com.intellij.codeInsight.completion.CompletionTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
abstract public class KotlinCompletionTestCase extends CompletionTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
}
idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
}
idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
}
idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
}
idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt
+4 -4
View File
@@ -18,16 +18,16 @@ package org.jetbrains.kotlin.idea
import com.intellij.refactoring.MultiFileTestCase
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.test.JetTestUtils
public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
override fun setUp() {
super.setUp()
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory())
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
}
override fun tearDown() {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory())
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
super.tearDown()
}
}
}
idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java
+1 -2
View File
@@ -25,7 +25,6 @@ import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
@@ -38,7 +37,7 @@ public class PluginTestCaseBase {
@NotNull
public static String getTestDataPathBase() {
return JetTestCaseBuilder.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
}
private static Sdk getSdk(String sdkHome) {
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+2 -2
View File
@@ -29,12 +29,12 @@ import com.intellij.codeInspection.ex.InspectionManagerEx
import com.intellij.testFramework.InspectionTestUtil
import com.intellij.codeInspection.InspectionManager
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import com.intellij.testFramework.IdeaTestUtil
import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.Sdk
import org.apache.commons.lang.SystemUtils;
import org.jetbrains.kotlin.test.JetTestUtils
public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
@@ -50,7 +50,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
val srcDir = inspectionsTestDir.getParentFile()!!
with(myFixture) {
setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/$srcDir")
setTestDataPath("${JetTestUtils.getHomeDirectory()}/$srcDir")
val psiFiles = srcDir
.listFiles { it.getName().endsWith(".kt") }!!
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+2 -3
View File
@@ -42,7 +42,6 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.MockLibraryUtil;
@@ -75,7 +74,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
UsefulTestCase.edt(new Runnable() {
@Override
@@ -111,7 +110,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
@Override
protected void tearDown() throws Exception {
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt
+2 -2
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor
import java.io.File
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest
import org.jetbrains.kotlin.test.JetTestUtils
class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() {
@@ -35,6 +35,6 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() {
}
override fun getProjectDescriptor(): LightProjectDescriptor {
return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
}
}
idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+2 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.idea.decompiler.textBuilder
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import com.intellij.psi.PsiManager
import org.junit.Assert
import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor
@@ -29,11 +28,12 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Ki
import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest
import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName
import org.jetbrains.kotlin.idea.decompiler.JetClsFile
import org.jetbrains.kotlin.test.JetTestUtils
public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() {
override fun getProjectDescriptor(): LightProjectDescriptor {
return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
}
fun testPackagePartIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClass(PACKAGE_PART)
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+2 -2
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.PluginTestCaseBase;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
import java.io.FilenameFilter;
@@ -199,6 +199,6 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
@Override
protected String getTestDataPath() {
return JetTestCaseBuilder.getHomeDirectory() + "/";
return JetTestUtils.getHomeDirectory() + "/";
}
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+1 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable
import com.intellij.ide.DataManager
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandler
import java.io.File
@@ -138,7 +137,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
val afterFile = File("$path.after")
val conflictFile = File("$path.conflicts")
fixture.setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/${mainFile.getParent()}")
fixture.setTestDataPath("${JetTestUtils.getHomeDirectory()}/${mainFile.getParent()}")
val file = fixture.configureByFile(mainFile.getName()) as JetFile
idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2015 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.
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies;
import org.jetbrains.kotlin.idea.PluginTestCaseBase;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,12 +36,12 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
super.tearDown();
}
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt
+1 -2
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -46,7 +45,7 @@ import org.jetbrains.kotlin.idea.JetFileType
import com.intellij.openapi.util.io.FileUtil
public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtureTestCase() {
override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory()
override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
public fun doTest(testPath: String) {
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java
+3 -3
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.ReferenceUtils;
import org.jetbrains.kotlin.test.util.UtilPackage;
import org.junit.Assert;
@@ -66,12 +66,12 @@ public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsi
protected void setUp() throws Exception {
super.setUp();
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
}
@Override
protected void tearDown() throws Exception {
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
+2 -2
View File
@@ -22,13 +22,13 @@ import com.intellij.openapi.application.ApplicationManager
import java.io.File
import com.intellij.openapi.command.CommandProcessor
import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
import com.intellij.codeInsight.CodeInsightSettings
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils
public abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCase() {
override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory()
override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
protected fun doTest(testPath: String) {