azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable light class analysis mode for AbstractLightAnalysisModeCodegenTest. See also the previous commit.

Browse Source 
Note that no test data files are changed, it means that light classes with the light analysis mode enabled are the same as with the full analysis.
This commit is contained in:
Yan Zhulanow
2016-11-03 04:30:20 +03:00
committed by Yan Zhulanow
parent 328286ab14
commit 92282072fc
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+4
View File
@@ -70,6 +70,8 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES
) )
setupEnvironment(myEnvironment)
loadMultiFiles(files) loadMultiFiles(files)
val txtFile = getTextFile(wholeFile) val txtFile = getTextFile(wholeFile)
@@ -86,6 +88,8 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles) KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles)
} }
protected open fun setupEnvironment(environment: KotlinCoreEnvironment) {}
private class TextCollectingVisitor : ClassVisitor(ASM5) { private class TextCollectingVisitor : ClassVisitor(ASM5) {
private class Declaration(val text: String, val annotations: MutableList<String> = arrayListOf()) private class Declaration(val text: String, val annotations: MutableList<String> = arrayListOf())
compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeCodegenTest.kt
+10 -2
View File
@@ -16,15 +16,23 @@
package org.jetbrains.kotlin.codegen package org.jetbrains.kotlin.codegen
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension
import java.io.File import java.io.File
abstract class AbstractLightAnalysisModeCodegenTest : AbstractBytecodeListingTest() { abstract class AbstractLightAnalysisModeCodegenTest : AbstractBytecodeListingTest() {
override val classBuilderFactory: ClassBuilderFactory override val classBuilderFactory: ClassBuilderFactory
get() = ClassBuilderFactories.TEST_LIGHT_CLASSES get() = ClassBuilderFactories.TEST_KAPT3
override fun setupEnvironment(environment: KotlinCoreEnvironment) {
AnalysisHandlerExtension.registerExtension(environment.project, PartialAnalysisHandlerExtension())
}
override fun getTextFile(ktFile: File): File { override fun getTextFile(ktFile: File): File {
val boxTestsDir = File("compiler/testData/codegen/box") val boxTestsDir = File("compiler/testData/codegen/box")
val outDir = File("compiler/testData/codegen/light-analysis", ktFile.toRelativeString(boxTestsDir)).parent val outDir = File("compiler/testData/codegen/light-analysis", ktFile.toRelativeString(boxTestsDir)).parent
return File(outDir, ktFile.nameWithoutExtension + ".txt") return File(outDir, ktFile.nameWithoutExtension + ".txt")
} }
} }