Minor: add test for KT-11993 "NoSuchMethodError when testing internal symbols"
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
* Copyright 2010-2016 JetBrains s.r.o.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -54,6 +54,7 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor
|
|||||||
import org.jetbrains.org.objectweb.asm.Opcodes
|
import org.jetbrains.org.objectweb.asm.Opcodes
|
||||||
import org.junit.Assert
|
import org.junit.Assert
|
||||||
import java.io.*
|
import java.io.*
|
||||||
|
import java.net.URLClassLoader
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import java.util.regex.Pattern
|
import java.util.regex.Pattern
|
||||||
import java.util.zip.ZipOutputStream
|
import java.util.zip.ZipOutputStream
|
||||||
@@ -532,6 +533,15 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
|||||||
result.checkErrors()
|
result.checkErrors()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun testInternalFromSpecialRelatedModule() {
|
||||||
|
initProject()
|
||||||
|
makeAll().assertSuccessful()
|
||||||
|
|
||||||
|
val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray()
|
||||||
|
val clazz = URLClassLoader(classpath).loadClass("test2.BarKt")
|
||||||
|
clazz.getMethod("box").invoke(null)
|
||||||
|
}
|
||||||
|
|
||||||
fun testCircularDependenciesInternalFromAnotherModule() {
|
fun testCircularDependenciesInternalFromAnotherModule() {
|
||||||
initProject()
|
initProject()
|
||||||
val result = makeAll()
|
val result = makeAll()
|
||||||
|
|||||||
+32
@@ -0,0 +1,32 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
|
<resourceExtensions />
|
||||||
|
<annotationProcessing>
|
||||||
|
<profile default="true" name="Default" enabled="false">
|
||||||
|
<processorPath useClasspath="true" />
|
||||||
|
</profile>
|
||||||
|
</annotationProcessing>
|
||||||
|
</component>
|
||||||
|
<component name="CopyrightManager" default="">
|
||||||
|
<module2copyright />
|
||||||
|
</component>
|
||||||
|
<component name="DependencyValidationManager">
|
||||||
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
|
</component>
|
||||||
|
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
|
||||||
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
|
</component>
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="library" name="KotlinRuntime" level="project" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
|
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
package test1
|
||||||
|
|
||||||
|
@Target(AnnotationTarget.FILE)
|
||||||
|
@Retention(AnnotationRetention.SOURCE)
|
||||||
|
internal annotation class InternalFileAnnotation1()
|
||||||
|
|
||||||
|
@Target(AnnotationTarget.CLASS)
|
||||||
|
@Retention(AnnotationRetention.SOURCE)
|
||||||
|
internal annotation class InternalClassAnnotation1()
|
||||||
|
|
||||||
|
internal open class InternalClass1
|
||||||
|
|
||||||
|
abstract class ClassA1(internal val member: Int)
|
||||||
|
|
||||||
|
abstract class ClassB1 {
|
||||||
|
internal abstract val member: Int
|
||||||
|
internal fun func() = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
internal val internalProp = 1
|
||||||
|
|
||||||
|
internal fun internalFun() {}
|
||||||
|
|
||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="module" module-name="module1" />
|
||||||
|
<orderEntry type="library" name="KotlinRuntime" level="project" />
|
||||||
|
</component>
|
||||||
|
<component name="TestModuleProperties" production-module="module1" />
|
||||||
|
</module>
|
||||||
|
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
// TODO uncomment annotations when KT-12199 will be fixed
|
||||||
|
|
||||||
|
//@file:InternalFileAnnotation1
|
||||||
|
|
||||||
|
package test2
|
||||||
|
|
||||||
|
import test1.*
|
||||||
|
|
||||||
|
internal class FromInternalClass1: InternalClass1()
|
||||||
|
|
||||||
|
//@InternalClassAnnotation
|
||||||
|
class FromClassA1 : ClassA1(10)
|
||||||
|
|
||||||
|
class FromClassB1 : ClassB1() {
|
||||||
|
internal override val member = 10
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box() {
|
||||||
|
internalProp
|
||||||
|
internalFun()
|
||||||
|
|
||||||
|
InternalClass1()
|
||||||
|
FromClassA1().member
|
||||||
|
FromClassB1().member
|
||||||
|
FromClassB1().func()
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user