Tests: remove obsolete txt dumps in CompileKotlin...Test

Check that the client code compiles against the "broken" classpath
instead. Descriptor text dump is a part of the obsolete test
infrastructure and should not be used anymore.
This commit is contained in:
Alexander Udalov
2023-08-01 18:08:08 +02:00
committed by Space Team
parent 19abb66886
commit b3b9ffaea9
7 changed files with 4 additions and 28 deletions
@@ -1,11 +0,0 @@
package test
public fun bar(): @test.Ann kotlin.String
public interface Ann {
}
@test.Ann(s = "class") public final class Test {
public constructor Test()
@test.Ann(s = "function") public final fun foo(/*0*/ @test.Ann(s = "parameter") s: @test.Ann kotlin.String): @test.Ann kotlin.String
}
@@ -1,6 +0,0 @@
package test
public val inn3r: testing.Outer.Inner
public val nested: testing.Outer.Nested
public val outer: testing.Outer
public val testObjectProperty: testing.TopLevelObject
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparatorAdaptor.validateAndCompareDescriptorWithFile
import org.jetbrains.kotlin.utils.toMetadataVersion import org.jetbrains.kotlin.utils.toMetadataVersion
import org.jetbrains.org.objectweb.asm.* import org.jetbrains.org.objectweb.asm.*
import org.jetbrains.org.objectweb.asm.tree.ClassNode import org.jetbrains.org.objectweb.asm.tree.ClassNode
@@ -50,14 +49,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
override val testDataPath: String override val testDataPath: String
get() = "compiler/testData/compileKotlinAgainstCustomBinaries/" get() = "compiler/testData/compileKotlinAgainstCustomBinaries/"
private fun doTestWithTxt(vararg extraClassPath: File) {
validateAndCompareDescriptorWithFile(
analyzeFileToPackageView(*extraClassPath),
AbstractLoadJavaTest.COMPARATOR_CONFIGURATION,
getTestDataFileWithExtension("txt")
)
}
private fun analyzeFileToPackageView(vararg extraClassPath: File): PackageViewDescriptor { private fun analyzeFileToPackageView(vararg extraClassPath: File): PackageViewDescriptor {
val environment = createEnvironment(extraClassPath.toList()) val environment = createEnvironment(extraClassPath.toList())
@@ -163,7 +154,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
} }
fun testSameLibraryTwiceInClasspath() { fun testSameLibraryTwiceInClasspath() {
doTestWithTxt(compileLibrary("library-1"), compileLibrary("library-2")) compileKotlin("source.kt", tmpdir, listOf(compileLibrary("library-1"), compileLibrary("library-2")))
} }
fun testMissingEnumReferencedInAnnotationArgument() { fun testMissingEnumReferencedInAnnotationArgument() {
@@ -461,7 +452,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
val library1 = compileLibrary("library-1") val library1 = compileLibrary("library-1")
val usage = compileLibrary("usage", extraClassPath = listOf(library1)) val usage = compileLibrary("usage", extraClassPath = listOf(library1))
val library2 = compileLibrary("library-2") val library2 = compileLibrary("library-2")
doTestWithTxt(usage, library2) compileKotlin("source.kt", tmpdir, listOf(usage, library2))
} }
fun testProhibitNestedClassesByDollarName() { fun testProhibitNestedClassesByDollarName() {