diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 2c90723af7f7..8577f0d6ba80 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -7,15 +7,13 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.textBuilder.findTestLibraryRoot +import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor -import org.jetbrains.kotlin.test.KotlinTestUtils -import org.junit.Ignore import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith import java.io.File @RunWith(JUnit38ClassRunner::class) -@Ignore("has to be deleted as it seems a compiler test") class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { fun testPackage() = testStubsForFileWithWrongAbiVersion("Wrong_packageKt") @@ -29,6 +27,6 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(IDEA_TEST_DATA_DIR.absolutePath + "/wrongAbiVersionLib/bin")) } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index 3c62c2ba0ebe..8622c91a1368 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -12,20 +12,17 @@ import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile import org.jetbrains.kotlin.idea.decompiler.common.INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName +import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor -import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert -import org.junit.Ignore import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith import java.io.File @RunWith(JUnit38ClassRunner::class) -@Ignore("has to be deleted as it seems a compiler test") class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() { - override fun getProjectDescriptor(): LightProjectDescriptor { - return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(IDEA_TEST_DATA_DIR.absolutePath + "/wrongAbiVersionLib/bin")) } fun testSyntheticClassIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClasses() diff --git a/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class new file mode 100644 index 000000000000..5e5e0082bf0f Binary files /dev/null and b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class differ diff --git a/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/META-INF/main.kotlin_module b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/META-INF/main.kotlin_module new file mode 100644 index 000000000000..ed11a3c5941d Binary files /dev/null and b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/META-INF/main.kotlin_module differ diff --git a/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda$other$1.class b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda$other$1.class new file mode 100644 index 000000000000..1750013996a0 Binary files /dev/null and b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda$other$1.class differ diff --git a/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda.class b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda.class new file mode 100644 index 000000000000..9303fe824875 Binary files /dev/null and b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/ClassWithInnerLambda.class differ diff --git a/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/Wrong_packageKt.class b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/Wrong_packageKt.class new file mode 100644 index 000000000000..56a09608109f Binary files /dev/null and b/plugins/kotlin/idea/tests/testData/wrongAbiVersionLib/bin/wrong/Wrong_packageKt.class differ