diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault$$TImpl.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault$$TImpl.class deleted file mode 100644 index 8e4640ad252..00000000000 Binary files a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault$$TImpl.class and /dev/null differ diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault.class deleted file mode 100644 index ac6e941f3b7..00000000000 Binary files a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/TraitWithDefault.class and /dev/null differ diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/src/TraitWithDefault.kt b/compiler/testData/cli/jvm/wrongAbiVersionLib/src/TraitWithDefault.kt deleted file mode 100644 index 4c81a02698d..00000000000 --- a/compiler/testData/cli/jvm/wrongAbiVersionLib/src/TraitWithDefault.kt +++ /dev/null @@ -1,5 +0,0 @@ -package wrong - -interface TraitWithDefault { - fun foo() = 1 -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index b216ea5e582..f935a825ca8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt @@ -43,24 +43,6 @@ public abstract class AbstractInternalCompiledClassesTest : JetLightCodeInsightF private fun isClassOfKind(kind: KotlinClass.Kind) : VirtualFile.() -> Boolean = isFileWithHeader { it.classKind == kind } - protected fun doTestTraitImplClassIsVisibleAsJavaClass() { - val project = getProject() - doTest("trait impl", isSyntheticClassOfKind(TRAIT_IMPL)) { - val psiFile = PsiManager.getInstance(project).findFile(this)!! - Assert.assertTrue("Should not be kotlin file", - psiFile !is JetClsFile) - Assert.assertTrue("Should be java file, was ${psiFile.javaClass.getSimpleName()}", - psiFile is ClsFileImpl) - - val decompiledPsiFile = (psiFile as PsiCompiledFile).getDecompiledPsiFile()!! - Assert.assertTrue("Should be java decompiled file, was ${decompiledPsiFile.javaClass.getSimpleName()}", - decompiledPsiFile is PsiJavaFile) - val classes = (decompiledPsiFile as PsiJavaFile).getClasses() - Assert.assertTrue("Should have some decompiled text", - classes.size() == 1 && classes[0].getName()!!.endsWith(JvmAbi.DEFAULT_IMPLS_SUFFIX)) - } - } - protected fun doTestNoFilesAreBuiltForSyntheticClass(kind: KotlinSyntheticClass.Kind): Unit = doTestNoClassFilesAreBuiltFor(kind.toString(), isSyntheticClassOfKind(kind)) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index 13dd81fb54b..a64814445b1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt @@ -47,8 +47,6 @@ public class InternalCompiledClassesTest : AbstractInternalCompiledClassesTest() ClassFileViewProvider.isInnerClass(this) } - fun testTraitImplClassIsVisibleAsJavaClass() = doTestTraitImplClassIsVisibleAsJavaClass() - override fun getProjectDescriptor(): LightProjectDescriptor { return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, /* withSources = */ false) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index a13d69e56aa..6ac8a89a780 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -38,8 +38,6 @@ public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClas fun testPackagePartIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClass(PACKAGE_PART) - fun testTraitImplClassIsVisibleAsJavaClassWrongAbiVersion() = doTestTraitImplClassIsVisibleAsJavaClass() - fun testAnonymousFunctionIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClass(ANONYMOUS_FUNCTION) fun testClassWithWrongAbiVersion() = doTest("ClassWithWrongAbiVersion")