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,9 +0,0 @@
package protectedPack;
import java.lang.String;
public class overrideProtectedFunInPackage {
protected String foo() {
return "fail";
}
}
@@ -1,8 +1,20 @@
// FILE: protectedPack/J.java
package protectedPack;
public class J {
protected String foo() {
return "fail";
}
}
// FILE: 1.kt
package protectedPackKotlin
import protectedPack.overrideProtectedFunInPackage
import protectedPack.J
class Derived: overrideProtectedFunInPackage() {
class Derived : J() {
protected override fun foo(): String? {
return "OK"
}
@@ -1,9 +0,0 @@
package protectedPack;
import java.lang.String;
public class protectedFunInPackage {
protected String foo() {
return "OK";
}
}
@@ -1,5 +1,17 @@
// FILE: protectedPack/J.java
package protectedPack;
public class J {
protected String foo() {
return "OK";
}
}
// FILE: 1.kt
package protectedPack
fun box(): String {
return protectedFunInPackage().foo()!!
return J().foo()!!
}
@@ -1,7 +0,0 @@
package protectedPack;
import java.lang.String;
public class protectedPropertyInPackage {
protected String foo = "OK";
}
@@ -1,5 +1,15 @@
// FILE: protectedPack/J.java
package protectedPack;
public class J {
protected String foo = "OK";
}
// FILE: 1.kt
package protectedPack
fun box(): String {
return protectedPropertyInPackage().foo!!
return J().foo!!
}
@@ -1,11 +0,0 @@
package protectedPack;
import java.lang.String;
public class protectedStaticClass {
protected static class Inner {
public String foo() {
return "OK";
}
}
}
@@ -1,11 +1,25 @@
// FILE: protectedPack/J.java
package protectedPack;
public class J {
protected static class Inner {
public String foo() {
return "OK";
}
}
}
// FILE: 1.kt
package protectedPack
class Derived(): protectedStaticClass() {
class Derived : J() {
fun test(): String {
return protectedStaticClass.Inner().foo()!!
return J.Inner().foo()!!
}
}
fun box(): String {
return Derived().test()
return Derived().test()
}