From a752f3f38eb29ba81fa6a9010d1d1dbe512076e3 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 15 Jan 2018 19:19:12 +0300 Subject: [PATCH] Misc: Rename class --- .../test/AbstractCompiledKotlinInJavaCompletionTest.kt | 5 +++-- .../test/AbstractJvmWithLibBasicCompletionTest.kt | 4 ++-- .../idea/test/KotlinLightCodeInsightFixtureTestCase.kt | 6 +++++- ...or.java => SdkAndMockLibraryProjectDescriptor.java} | 10 +++++----- .../kotlin/asJava/LightClassesClasspathSortingTest.kt | 7 +++++-- .../AbstractKotlinFindUsagesWithLibraryTest.kt | 9 +++++---- .../idea/codeInsight/OverrideImplementWithLibTest.kt | 6 +++--- .../evaluate/CodeFragmentCompletionInLibraryTest.kt | 6 +++--- .../idea/decompiler/InternalCompiledClassesTest.kt | 4 ++-- .../AbstractNavigateFromLibrarySourcesTest.kt | 9 --------- .../navigation/AbstractNavigateToLibraryTest.kt | 5 ++++- .../decompiler/navigation/NavigateFromJSLibraryTest.kt | 4 ++-- .../navigation/NavigateFromLibrarySourcesTest.kt | 10 ++++++++-- .../textBuilder/AbstractDecompiledTextBaseTest.kt | 10 ++++++++-- .../AbstractDecompiledTextFromJsMetadataTest.kt | 4 ++-- .../idea/parameterInfo/AbstractParameterInfoTest.kt | 4 ++-- .../idea/resolve/AbstractReferenceResolveInJavaTest.kt | 4 ++-- .../resolve/AbstractReferenceResolveWithLibTest.java | 4 ++-- .../org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt | 9 +++++---- 19 files changed, 68 insertions(+), 52 deletions(-) rename idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/{JdkAndMockLibraryProjectDescriptor.java => SdkAndMockLibraryProjectDescriptor.java} (94%) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt index 8ee31fe3467..d7423e773f3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt @@ -17,12 +17,13 @@ package org.jetbrains.kotlin.idea.completion.test import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform abstract class AbstractCompiledKotlinInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { override fun getPlatform() = JvmPlatform - override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false) + override fun getProjectDescriptor() = + SdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false) override fun defaultCompletionType() = CompletionType.BASIC } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt index fea3709d375..b7afe3758fa 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test import com.intellij.codeInsight.completion.CompletionType import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform @@ -29,7 +29,7 @@ abstract class AbstractJvmWithLibBasicCompletionTest : KotlinFixtureCompletionBa if (PluginTestCaseBase.isAllFilesPresentTest(getTestName(true))) { return super.getProjectDescriptor() } - return JdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(false) + "Src", false) + return SdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(false) + "Src", false) } override fun getPlatform() = JvmPlatform diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index e7da92fcd78..12c6c06c461 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -114,7 +114,11 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix val withLibraryDirective = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "WITH_LIBRARY:") if (!withLibraryDirective.isEmpty()) { - return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/" + withLibraryDirective.get(0), true) + return SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/" + withLibraryDirective.get( + 0 + ), true + ) } else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_SOURCES")) { return ProjectDescriptorWithStdlibSources.INSTANCE diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java similarity index 94% rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java rename to idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java index 29fd9d73b12..d9a03453f66 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java @@ -34,7 +34,7 @@ import java.io.File; import java.util.Collections; import java.util.List; -public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescriptor { +public class SdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescriptor { public static final String LIBRARY_NAME = "myKotlinLib"; private final String sourcesPath; @@ -44,16 +44,16 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri private final boolean allowKotlinPackage; private final List classpath; - public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources) { + public SdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources) { this(sourcesPath, withSources, false, false, false); } - public JdkAndMockLibraryProjectDescriptor( + public SdkAndMockLibraryProjectDescriptor( String sourcesPath, boolean withSources, boolean withRuntime, boolean isJsLibrary, boolean allowKotlinPackage) { this(sourcesPath, withSources, withRuntime, isJsLibrary, allowKotlinPackage, Collections.emptyList()); } - public JdkAndMockLibraryProjectDescriptor( + public SdkAndMockLibraryProjectDescriptor( String sourcesPath, boolean withSources, boolean withRuntime, boolean isJsLibrary, boolean allowKotlinPackage, List classpath ) { this.sourcesPath = sourcesPath; @@ -107,7 +107,7 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - JdkAndMockLibraryProjectDescriptor that = (JdkAndMockLibraryProjectDescriptor) o; + SdkAndMockLibraryProjectDescriptor that = (SdkAndMockLibraryProjectDescriptor) o; if (withSources != that.withSources) return false; if (withRuntime != that.withRuntime) return false; diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt index 5d4e7920a57..7a27beee7db 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt @@ -21,7 +21,7 @@ import com.intellij.psi.impl.ResolveScopeManager import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.idea.caches.resolve.lightClasses.KtLightClassForDecompiledDeclaration -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.configureAs @@ -61,7 +61,10 @@ class LightClassesClasspathSortingTest : KotlinCodeInsightTestCase() { } private fun getProjectDescriptor(dir: String) = - JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/lightClassesOrder/$dir", true) + SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/decompiler/lightClassesOrder/$dir", + true + ) override fun getTestDataPath(): String? { return PluginTestCaseBase.getTestDataPathBase() + "/decompiler/lightClassesOrder/" diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt index 2e6eca67c34..57d34c160f8 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt @@ -16,12 +16,13 @@ package org.jetbrains.kotlin.findUsages -import com.intellij.psi.PsiElement -import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractFindUsagesTest() { override fun getProjectDescriptor() = - JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/findUsages/libraryUsages/_library", true) + SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/findUsages/libraryUsages/_library", + true + ) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt index 75f48d30394..8d10dabb837 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt @@ -16,8 +16,7 @@ package org.jetbrains.kotlin.idea.codeInsight -import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase class OverrideImplementWithLibTest : AbstractOverrideImplementTest() { @@ -28,7 +27,8 @@ class OverrideImplementWithLibTest : AbstractOverrideImplementTest() { myFixture.testDataPath = TEST_PATH } - override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(true) + "Src", false) + override fun getProjectDescriptor() = + SdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(true) + "Src", false) fun testFakeOverride() { doOverrideFileTest() diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index e54bad76208..39bde8327ab 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -25,7 +25,7 @@ import com.intellij.psi.PsiManager import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.idea.completion.test.testCompletion -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtPsiFactory @@ -37,11 +37,11 @@ private val LIBRARY_SRC_PATH = KotlinTestUtils.getHomeDirectory() + "/idea/idea- class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { - override fun getProjectDescriptor() = object: JdkAndMockLibraryProjectDescriptor(LIBRARY_SRC_PATH, false) { + override fun getProjectDescriptor() = object: SdkAndMockLibraryProjectDescriptor(LIBRARY_SRC_PATH, false) { override fun configureModule(module: Module, model: ModifiableRootModel) { super.configureModule(module, model) - val library = model.moduleLibraryTable.getLibraryByName(JdkAndMockLibraryProjectDescriptor.LIBRARY_NAME)!! + val library = model.moduleLibraryTable.getLibraryByName(SdkAndMockLibraryProjectDescriptor.LIBRARY_NAME)!! val modifiableModel = library.modifiableModel modifiableModel.addRoot(findLibrarySourceDir(), OrderRootType.SOURCES) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index 75ca611d4ed..f8a5b73be75 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler import com.intellij.psi.ClassFileViewProvider import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase class InternalCompiledClassesTest : AbstractInternalCompiledClassesTest() { @@ -33,6 +33,6 @@ class InternalCompiledClassesTest : AbstractInternalCompiledClassesTest() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, /* withSources = */ false) + return SdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, /* withSources = */ false) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt index c6ad3ae88f7..7cf8a1ae878 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt @@ -9,18 +9,9 @@ import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VirtualFileManager -import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement -import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.asJava.toLightClass -import org.jetbrains.kotlin.idea.caches.resolve.lightClasses.KtLightClassForDecompiledDeclaration -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import org.jetbrains.kotlin.psi.KtClass -import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.utils.sure -import kotlin.test.assertTrue abstract class AbstractNavigateFromLibrarySourcesTest : LightCodeInsightFixtureTestCase() { protected fun navigationElementForReferenceInLibrarySource(filePath: String, referenceText: String): PsiElement { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.kt index a2e16562da0..666043e2623 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.kt @@ -61,7 +61,10 @@ abstract class AbstractNavigateToLibraryTest : KotlinCodeInsightTestCase() { open fun getProjectDescriptor(): KotlinLightProjectDescriptor = - JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/library", withSource) + SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/library", + withSource + ) } abstract class AbstractNavigateToDecompiledLibraryTest : AbstractNavigateToLibraryTest() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt index 72ec3946d70..cb6f851ae4c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation import com.intellij.testFramework.LightProjectDescriptor import junit.framework.TestCase -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase class NavigateFromJSLibrarySourcesTest : AbstractNavigateFromLibrarySourcesTest() { @@ -30,7 +30,7 @@ class NavigateFromJSLibrarySourcesTest : AbstractNavigateFromLibrarySourcesTest( } override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor( + return SdkAndMockLibraryProjectDescriptor( PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromJSLibSource", true, true, diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 3a324a501ba..3ceb7241b58 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.idea.caches.resolve.lightClasses.KtLightClassForDecompiledDeclaration -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject @@ -55,7 +55,13 @@ class NavigateFromLibrarySourcesTest: AbstractNavigateFromLibrarySourcesTest() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromLibSource", true, true, false, false) + return SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromLibSource", + true, + true, + false, + false + ) } private fun navigationElementForReferenceInLibrarySource(referenceText: String) = diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt index e80c811c583..6048b1d1e84 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase @@ -56,7 +56,13 @@ abstract class AbstractDecompiledTextBaseTest( if (isAllFilesPresentInTest()) { return KotlinLightProjectDescriptor.INSTANCE } - return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(false), false, withRuntime, isJsLibrary, allowKotlinPackage) + return SdkAndMockLibraryProjectDescriptor( + TEST_DATA_PATH + "/" + getTestName(false), + false, + withRuntime, + isJsLibrary, + allowKotlinPackage + ) } private fun checkThatFileWasParsedCorrectly(clsFile: PsiFile) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt index 5d412a364f5..b5d25e17fe4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiFile import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol import kotlin.test.assertTrue @@ -39,6 +39,6 @@ abstract class AbstractJsDecompiledTextFromJsMetadataTest : AbstractDecompiledTe fun getKjsmFile(packageName: String, module: Module): VirtualFile { val root = findTestLibraryRoot(module)!! root.refresh(false, true) - val packageDir = root.findFileByRelativePath(JdkAndMockLibraryProjectDescriptor.LIBRARY_NAME + "/" + packageName.replace(".", "/"))!! + val packageDir = root.findFileByRelativePath(SdkAndMockLibraryProjectDescriptor.LIBRARY_NAME + "/" + packageName.replace(".", "/"))!! return packageDir.findChild(JsSerializerProtocol.getKjsmFilePath(FqName(packageName)).substringAfterLast('/'))!! } diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt index dc596d7dd9e..63e58e38f91 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt @@ -24,7 +24,7 @@ import com.intellij.psi.PsiWhiteSpace import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.KotlinLanguage -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.lexer.KtTokens @@ -38,7 +38,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor { val root = KotlinTestUtils.getTestsRoot(this::class.java) if (root.contains("Lib")) { - return JdkAndMockLibraryProjectDescriptor("$root/sharedLib", true, true, false, false) + return SdkAndMockLibraryProjectDescriptor("$root/sharedLib", true, true, false, false) } return ProjectDescriptorWithStdlibSources.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt index 4ff1aa3f064..1cbf25a4a50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.resolve import com.intellij.psi.PsiElement import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtDeclaration import org.junit.Assert @@ -41,7 +41,7 @@ abstract class AbstractReferenceToCompiledKotlinResolveInJavaTest : AbstractRefe performChecks() } - override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(FILE_WITH_KOTLIN_CODE, true) + override fun getProjectDescriptor() = SdkAndMockLibraryProjectDescriptor(FILE_WITH_KOTLIN_CODE, true) override val refMarkerText: String get() = "CLS_REF" diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java index 5f12eb38e4e..b789457d134 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java @@ -23,7 +23,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import kotlin.jvm.functions.Function0; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.test.AstAccessControl; -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; @@ -35,7 +35,7 @@ public abstract class AbstractReferenceResolveWithLibTest extends AbstractRefere if (PluginTestCaseBase.isAllFilesPresentTest(getTestName(true))) { return null; } - return new JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(true) + "Src", false, true, false, false); + return new SdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(true) + "Src", false, true, false, false); } @Nullable diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt index d361e7172b2..08db26a818a 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt @@ -20,7 +20,7 @@ import com.intellij.lang.html.HTMLLanguage import com.intellij.testFramework.LightProjectDescriptor import org.intellij.lang.annotations.Language import org.intellij.lang.regexp.RegExpLanguage -import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.KotlinTestUtils @@ -55,8 +55,9 @@ class KotlinLibInjectionTest : AbstractInjectionTest() { override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor( - PluginTestCaseBase.getTestDataPathBase() + "/injection/lib/", false, false, false, true, - listOf(KotlinTestUtils.getHomeDirectory() + "/ideaSDK/lib/annotations.jar")) + return SdkAndMockLibraryProjectDescriptor( + PluginTestCaseBase.getTestDataPathBase() + "/injection/lib/", false, false, false, true, + listOf(KotlinTestUtils.getHomeDirectory() + "/ideaSDK/lib/annotations.jar") + ) } }