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

Expand the AbstractJvmRuntimeDescriptorLoaderTest hack

Browse Source 
Remove type related annotations from java source as they have CLASS retention policy
This commit is contained in:
Denis Zharkov
2015-06-19 15:51:43 +03:00
parent 00e41fc238
commit 5ea0c14d4a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+5 -3
View File
@@ -67,6 +67,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
// NOTE: this test does a dirty hack of text substitution to make all annotations defined in source code retain at runtime. // NOTE: this test does a dirty hack of text substitution to make all annotations defined in source code retain at runtime.
// Specifically each "annotation class" in Kotlin sources is replaced by "Retention(RUNTIME) annotation class", and the same in Java // Specifically each "annotation class" in Kotlin sources is replaced by "Retention(RUNTIME) annotation class", and the same in Java
// Also type related annotations are removed from Java because they are invisible at runtime
protected fun doTest(fileName: String) { protected fun doTest(fileName: String) {
val file = File(fileName) val file = File(fileName)
val text = FileUtil.loadFile(file, true) val text = FileUtil.loadFile(file, true)
@@ -112,7 +113,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
val sources = JetTestUtils.createTestFiles(fileName, text, object : TestFileFactoryNoModules<File>() { val sources = JetTestUtils.createTestFiles(fileName, text, object : TestFileFactoryNoModules<File>() {
override fun create(fileName: String, text: String, directives: Map<String, String>): File { override fun create(fileName: String, text: String, directives: Map<String, String>): File {
val targetFile = File(tmpdir, fileName) val targetFile = File(tmpdir, fileName)
targetFile.writeText(addRuntimeRetentionToJavaSource(text)) targetFile.writeText(adaptJavaSource(text))
return targetFile return targetFile
} }
}) })
@@ -172,8 +173,9 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
) )
} }
private fun addRuntimeRetentionToJavaSource(text: String): String { private fun adaptJavaSource(text: String): String {
return text.replace( val typeAnnotations = arrayOf("NotNull", "Nullable", "ReadOnly", "Mutable")
return typeAnnotations.fold(text) { text, annotation -> text.replace("@$annotation", "") }.replace(
"@interface", "@interface",
"@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @interface" "@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @interface"
) )