Merge boxWithJava testData into box, delete BoxWithJava test

This commit is contained in:
Alexander Udalov
2016-03-07 16:54:45 +03:00
committed by Alexander Udalov
parent 16a0ddd2fb
commit f8dfaf4599
117 changed files with 723 additions and 815 deletions
@@ -0,0 +1,26 @@
// TARGET_BACKEND: JVM
// FILE: JavaClass.java
public abstract class JavaClass {
public static String test() {
return Test.INSTANCE.foo(new Outer<String>("OK").new Inner<Integer>(1));
}
}
// FILE: Kotlin.kt
class Outer<E>(val x: E) {
inner class Inner<F>(val y: F) {
fun foo() = x.toString() + y.toString()
}
}
object Test {
fun foo(x: Outer<String>.Inner<Integer>) = x.foo()
}
fun box(): String {
val result = JavaClass.test()
if (result != "OK1") return "Fail: $result"
return "OK"
}
@@ -0,0 +1,22 @@
// TARGET_BACKEND: JVM
// FILE: JavaClass.java
public abstract class JavaClass {
public abstract InnerClass onCreateInner();
public class InnerClass {
}
}
// FILE: Kotlin.kt
public class MyWallpaperService : JavaClass() {
override fun onCreateInner(): JavaClass.InnerClass = MyEngine()
private inner class MyEngine : JavaClass.InnerClass()
}
fun box(): String {
return if (MyWallpaperService().onCreateInner() != null) return "OK" else "fail"
}