From 0289b8e2906b250fec88f47f3cde1be758f471b2 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 31 Aug 2015 15:23:16 +0300 Subject: [PATCH] Fix tests: ClsStubBuilderTestGenerated should honor new file part generation scheme. --- .../TopLevelMembersAnnotatedKt.txt} | 0 .../annotations.kt | 0 .../topLevelMembersAnnotated.kt | 0 .../TopLevelMembersKt/TopLevelMembers.kt | 27 ++++ .../TopLevelMembersKt/TopLevelMembersKt.txt | 119 ++++++++++++++++++ .../TopLevelMembersPackage.txt | 113 ----------------- .../ClsStubBuilderTestGenerated.java | 12 +- 7 files changed, 155 insertions(+), 116 deletions(-) rename idea/testData/decompiler/stubBuilder/{TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt => TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt} (100%) rename idea/testData/decompiler/stubBuilder/{TopLevelMembersAnnotatedPackage => TopLevelMembersAnnotatedKt}/annotations.kt (100%) rename idea/testData/decompiler/stubBuilder/{TopLevelMembersAnnotatedPackage => TopLevelMembersAnnotatedKt}/topLevelMembersAnnotated.kt (100%) create mode 100644 idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt create mode 100644 idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt similarity index 100% rename from idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt rename to idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/annotations.kt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/annotations.kt similarity index 100% rename from idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/annotations.kt rename to idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/annotations.kt diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/topLevelMembersAnnotated.kt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt similarity index 100% rename from idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/topLevelMembersAnnotated.kt rename to idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt new file mode 100644 index 00000000000..8051a809315 --- /dev/null +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt @@ -0,0 +1,27 @@ +package foo.TopLevelMembers + +fun funWithBlockBody() { +} + +private fun funWithExprBody() = 3 + +private fun funWithParams(c: Int) { +} + +public val immutable: Double = 0.0 + +public var mutable: Float = 0.0f + +public val String.ext: String + get() = this + +public fun Int.ext(i: Int = 3): Int = this + i + +private fun funWithVarargParam(c: Int, vararg v: Int) { +} + +private fun probablyNothing(): Nothing = throw IllegalStateException() + +private val certainlyNothing: kotlin.Nothing = throw IllegalStateException() + +class Nothing \ No newline at end of file diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt new file mode 100644 index 00000000000..121d20e8b85 --- /dev/null +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt @@ -0,0 +1,119 @@ +PsiJetFileStubImpl[package=foo.TopLevelMembers] + PACKAGE_DIRECTIVE: + DOT_QUALIFIED_EXPRESSION: + REFERENCE_EXPRESSION:[referencedName=foo] + REFERENCE_EXPRESSION:[referencedName=TopLevelMembers] + IMPORT_LIST: + PROPERTY:[fqName=foo.TopLevelMembers.certainlyNothing, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=certainlyNothing] + MODIFIER_LIST:[private] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Nothing] + PROPERTY:[fqName=foo.TopLevelMembers.immutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=immutable] + MODIFIER_LIST:[public] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Double] + PROPERTY:[fqName=foo.TopLevelMembers.mutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=true, name=mutable] + MODIFIER_LIST:[public] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Float] + PROPERTY:[fqName=foo.TopLevelMembers.ext, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=ext] + MODIFIER_LIST:[public] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=String] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=String] + FUN:[fqName=foo.TopLevelMembers.funWithBlockBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithBlockBody] + MODIFIER_LIST:[internal] + VALUE_PARAMETER_LIST: + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Unit] + FUN:[fqName=foo.TopLevelMembers.funWithExprBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithExprBody] + MODIFIER_LIST:[private] + VALUE_PARAMETER_LIST: + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + FUN:[fqName=foo.TopLevelMembers.funWithParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithParams] + MODIFIER_LIST:[private] + VALUE_PARAMETER_LIST: + VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Unit] + FUN:[fqName=foo.TopLevelMembers.funWithVarargParam, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithVarargParam] + MODIFIER_LIST:[private] + VALUE_PARAMETER_LIST: + VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=v] + MODIFIER_LIST:[vararg] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Unit] + FUN:[fqName=foo.TopLevelMembers.probablyNothing, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=probablyNothing] + MODIFIER_LIST:[private] + VALUE_PARAMETER_LIST: + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=foo] + REFERENCE_EXPRESSION:[referencedName=TopLevelMembers] + REFERENCE_EXPRESSION:[referencedName=Nothing] + FUN:[fqName=foo.TopLevelMembers.ext, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=ext] + MODIFIER_LIST:[public] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + VALUE_PARAMETER_LIST: + VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] + TYPE_REFERENCE: + USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE:[isAbsoluteInRootPackage=false] + REFERENCE_EXPRESSION:[referencedName=kotlin] + REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt index 121d20e8b85..e210cd51fbd 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt @@ -4,116 +4,3 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] REFERENCE_EXPRESSION:[referencedName=foo] REFERENCE_EXPRESSION:[referencedName=TopLevelMembers] IMPORT_LIST: - PROPERTY:[fqName=foo.TopLevelMembers.certainlyNothing, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=certainlyNothing] - MODIFIER_LIST:[private] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Nothing] - PROPERTY:[fqName=foo.TopLevelMembers.immutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=immutable] - MODIFIER_LIST:[public] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Double] - PROPERTY:[fqName=foo.TopLevelMembers.mutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=true, name=mutable] - MODIFIER_LIST:[public] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Float] - PROPERTY:[fqName=foo.TopLevelMembers.ext, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=ext] - MODIFIER_LIST:[public] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=String] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=String] - FUN:[fqName=foo.TopLevelMembers.funWithBlockBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithBlockBody] - MODIFIER_LIST:[internal] - VALUE_PARAMETER_LIST: - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Unit] - FUN:[fqName=foo.TopLevelMembers.funWithExprBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithExprBody] - MODIFIER_LIST:[private] - VALUE_PARAMETER_LIST: - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - FUN:[fqName=foo.TopLevelMembers.funWithParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithParams] - MODIFIER_LIST:[private] - VALUE_PARAMETER_LIST: - VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Unit] - FUN:[fqName=foo.TopLevelMembers.funWithVarargParam, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithVarargParam] - MODIFIER_LIST:[private] - VALUE_PARAMETER_LIST: - VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=v] - MODIFIER_LIST:[vararg] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Unit] - FUN:[fqName=foo.TopLevelMembers.probablyNothing, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=probablyNothing] - MODIFIER_LIST:[private] - VALUE_PARAMETER_LIST: - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=foo] - REFERENCE_EXPRESSION:[referencedName=TopLevelMembers] - REFERENCE_EXPRESSION:[referencedName=Nothing] - FUN:[fqName=foo.TopLevelMembers.ext, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=ext] - MODIFIER_LIST:[public] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - VALUE_PARAMETER_LIST: - VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] - TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index d46059314e0..43b939e3394 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -137,9 +137,15 @@ public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest { doTest(fileName); } - @TestMetadata("TopLevelMembersAnnotatedPackage") - public void testTopLevelMembersAnnotatedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/"); + @TestMetadata("TopLevelMembersAnnotatedKt") + public void testTopLevelMembersAnnotatedKt() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/"); + doTest(fileName); + } + + @TestMetadata("TopLevelMembersKt") + public void testTopLevelMembersKt() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersKt/"); doTest(fileName); }