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
@@ -17,6 +17,7 @@ public class Box<T> {
} }
// FILE: test.kt // FILE: test.kt
// See KT-10313: ClassCastException with Generics
fun box(): String { fun box(): String {
val sub = Box<Long>(-1) val sub = Box<Long>(-1)
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: CompanionInitialization.java // FILE: CompanionInitialization.java
public class CompanionInitialization { public class CompanionInitialization {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// FILE: CompanionInitialization.java // FILE: CompanionInitialization.java
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: JavaClass.java // FILE: JavaClass.java
public abstract class JavaClass { public abstract class JavaClass {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: JavaClass.java // FILE: JavaClass.java
public abstract class JavaClass { public abstract class JavaClass {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: WithGenerics.java // FILE: WithGenerics.java
class WithGenerics { class WithGenerics {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: WithPrimary.java // FILE: WithPrimary.java
class WithPrimary { class WithPrimary {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: WithVarargs.java // FILE: WithVarargs.java
public class WithVarargs { public class WithVarargs {
@@ -1,3 +1,4 @@
// TARGET_BACKEND: JVM
// FILE: WithoutPrimary.java // FILE: WithoutPrimary.java
class WithoutPrimary { class WithoutPrimary {

Some files were not shown because too many files have changed in this diff Show More