Migrate boxAgainstJava tests to multi-file framework

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 _protected {
-    protected String getOk() { return "OK"; }
-}
@@ -1,11 +0,0 @@
-package p
-
-import _protected
-
-fun box(): String {
-    return KotlinClass().ok()
-}
-
-class KotlinClass : _protected() {
-    fun ok() = ok
-}
@@ -1,6 +0,0 @@
-public class _protectedSetter {
-    private String x = null;
-
-    public String getX() { return "OK"; }
-    protected void setX(String x) { this.x = x; }
-}
@@ -1,15 +0,0 @@
-package p
-
-import _protectedSetter
-
-fun box(): String {
-    return KotlinClass().ok()
-}
-
-class KotlinClass : _protectedSetter() {
-    fun ok(): String {
-        x = "o"
-        x += "k"
-        return x
-    }
-}
@@ -1,14 +0,0 @@
-interface A {
-    String getOk();
-}
-
-interface B {
-    String getOk();
-}
-
-interface C extends A, B {
-}
-
-class JavaClass implements C {
-    public String getOk() { return "OK"; }
-}
@@ -1,3 +1,24 @@
+// FILE: C.java
+
+interface A {
+    String getOk();
+}
+
+interface B {
+    String getOk();
+}
+
+interface C extends A, B {
+}
+
+// FILE: JavaClass.java
+
+class JavaClass implements C {
+    public String getOk() { return "OK"; }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    return f(JavaClass())
 }
@@ -1,3 +0,0 @@
-class JavaClass {
-    public String getOk() { return "OK"; }
-}
@@ -1,3 +1,11 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    public String getOk() { return "OK"; }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    return JavaClass().ok
 }
@@ -1,11 +0,0 @@
-class JavaClass {
-    private String myX;
-
-    public String getX() {
-        return myX;
-    }
-
-    public void setX(String x) {
-        myX = x;
-    }
-}
@@ -1,3 +1,19 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    private String myX;
+
+    public String getX() {
+        return myX;
+    }
+
+    public void setX(String x) {
+        myX = x;
+    }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    return JavaClass().doIt()
 }
@@ -1,10 +0,0 @@
-class JavaClass1 {
-    protected Object value = null;
-
-    public Object getSomething() { return null; }
-    public void setSomething(Object value) {  this.value = value; }
-}
-
-class JavaClass2 extends JavaClass1 {
-    public String getSomething() { return (String)value; }
-}
@@ -1,3 +1,18 @@
+// FILE: JavaClass2.java
+
+class JavaClass1 {
+    protected Object value = null;
+
+    public Object getSomething() { return null; }
+    public void setSomething(Object value) {  this.value = value; }
+}
+
+class JavaClass2 extends JavaClass1 {
+    public String getSomething() { return (String)value; }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    val javaClass = JavaClass2()
    javaClass.something = "OK"
@@ -1,11 +0,0 @@
-class JavaClass {
-    private int myX = 0;
-
-    public int getX() {
-        return myX;
-    }
-
-    public void setX(int x) {
-        myX = x;
-    }
-}
@@ -1,3 +1,19 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    private int myX = 0;
+
+    public int getX() {
+        return myX;
+    }
+
+    public void setX(int x) {
+        myX = x;
+    }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    val javaClass = JavaClass()
    javaClass.x++
@@ -0,0 +1,19 @@
+// FILE: JavaClass.java
+
+public class JavaClass {
+    protected String getOk() { return "OK"; }
+}
+
+// FILE: 1.kt
+
+package p
+
+import JavaClass
+
+fun box(): String {
+    return KotlinClass().ok()
+}
+
+class KotlinClass : JavaClass() {
+    fun ok() = ok
+}
@@ -0,0 +1,26 @@
+// FILE: JavaClass.java
+
+public class JavaClass {
+    private String x = null;
+
+    public String getX() { return "OK"; }
+    protected void setX(String x) { this.x = x; }
+}
+
+// FILE: 1.kt
+
+package p
+
+import JavaClass
+
+fun box(): String {
+    return KotlinClass().ok()
+}
+
+class KotlinClass : JavaClass() {
+    fun ok(): String {
+        x = "o"
+        x += "k"
+        return x
+    }
+}
@@ -1,11 +0,0 @@
-class JavaClass {
-    private String myX;
-
-    public String getX() {
-        return myX;
-    }
-
-    public void setX(String x) {
-        myX = x;
-    }
-}
@@ -1,3 +1,19 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    private String myX;
+
+    public String getX() {
+        return myX;
+    }
+
+    public void setX(String x) {
+        myX = x;
+    }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    val javaClass = JavaClass()
    javaClass.x = "OK"
@@ -1,12 +0,0 @@
-class JavaClass {
-    private String myX = "";
-
-    public String getX() {
-        return myX;
-    }
-
-    public JavaClass setX(String x) {
-        myX = x;
-        return this;
-    }
-}
@@ -1,3 +1,20 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    private String myX = "";
+
+    public String getX() {
+        return myX;
+    }
+
+    public JavaClass setX(String x) {
+        myX = x;
+        return this;
+    }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    val javaClass = JavaClass()
    if (javaClass.x.isEmpty()) {
@@ -1,12 +0,0 @@
-class JavaClass {
-    private String myX = "";
-
-    public String getX() {
-        return myX;
-    }
-
-    public double setX(String x) {
-        myX = x;
-        return 1.0;
-    }
-}
@@ -1,3 +1,20 @@
+// FILE: JavaClass.java
+
+class JavaClass {
+    private String myX = "";
+
+    public String getX() {
+        return myX;
+    }
+
+    public double setX(String x) {
+        myX = x;
+        return 1.0;
+    }
+}
+
+// FILE: 1.kt
+
 fun box(): String {
    val javaClass = JavaClass()
    if (javaClass.x.isEmpty()) {