Migrate boxAgainstJava tests to multi-file framework

This commit is contained in:
Alexander Udalov
2016-03-01 16:28:53 +03:00
parent 26de87d792
commit 280ad195ee
251 changed files with 2010 additions and 1399 deletions
@@ -1,3 +0,0 @@
public class fieldAccessFromExtensionInTraitImpl {
public final String result = "OK";
}
@@ -1,6 +1,12 @@
// KT-4878
// FILE: D.java
import fieldAccessFromExtensionInTraitImpl as D
public class D {
public final String result = "OK";
}
// FILE: 1.kt
// KT-4878
interface T {
fun Int.foo(d: D) = d.result!!
@@ -1,5 +0,0 @@
public class fieldAccessViaSubclass {
public String fieldO;
public static String fieldK;
}
@@ -1,12 +1,21 @@
// FILE: D.java
public class D {
public String fieldO;
public static String fieldK;
}
// FILE: 1.kt
// KT-3492
class MyWrongClass : fieldAccessViaSubclass() {
class MyWrongClass : D() {
}
fun box() : String {
val clazz = MyWrongClass()
clazz.fieldO = "O"
fieldAccessViaSubclass.fieldK = "K"
return clazz.fieldO!! + fieldAccessViaSubclass.fieldK!!
val clazz = MyWrongClass()
clazz.fieldO = "O"
D.fieldK = "K"
return clazz.fieldO!! + D.fieldK!!
}
@@ -1,7 +0,0 @@
package test;
public class referenceToJavaFieldViaBridge {
protected String field = "OK";
}
@@ -1,8 +1,16 @@
// FILE: test/D.java
import test.referenceToJavaFieldViaBridge
package test;
class A : referenceToJavaFieldViaBridge() {
public class D {
protected String field = "OK";
}
// FILE: 1.kt
import test.D
class A : D() {
fun a(): String {
return {field!!}()
}
@@ -10,4 +18,4 @@ class A : referenceToJavaFieldViaBridge() {
fun box(): String {
return A().a()
}
}