Split GenerateNotNullAssertionsTests into standard box and bytecode tests

compiler/testData/codegen/notNullAssertions/A.java

@@ -1,39 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-public class A {
-    @NotNull
-    public final String NULL = null;
-    
-    @NotNull
-    public static final String STATIC_NULL = null;
-    
-    public String foo() {
-        return null;
-    }
-    
-    public static String staticFoo() {
-        return null;
-    }
-    
-    public A plus(A a) {
-        return null;
-    }
-
-    public A inc() {
-        return null;
-    }
-    
-    public Object get(Object o) {
-        return null;
-    }
-
-    public A a() { return this; }
-
-    public static class B {
-        public static B b() { return null; }
-    }
-
-    public static class C {
-        public static C c() { return null; }
-    }
-}

compiler/testData/codegen/notNullAssertions/AssertionChecker.kt

@@ -1,75 +0,0 @@
-class AssertionChecker(val illegalStateExpected: Boolean) {
-    operator fun invoke(name: String, f: () -> Any) {
-        try {
-            f()
-        } catch (e: IllegalStateException) {
-            if (!illegalStateExpected) throw AssertionError("Unexpected IllegalStateException on calling $name")
-            return
-        }
-        if (illegalStateExpected) throw AssertionError("IllegalStateException expected on calling $name")
-    }
-}
-
-
-interface Tr {
-    fun foo(): String
-}
-
-class Derived : A(), Tr {
-    override fun foo() = super<A>.foo()
-}
-
-class Delegated : Tr by Derived() {
-}
-
-
-fun checkAssertions(illegalStateExpected: Boolean) {
-    val check = AssertionChecker(illegalStateExpected)
-    
-    // simple call
-    check("foo") { A().foo() }
-    
-    // simple static call
-    check("staticFoo") { A.staticFoo() }
-    
-    // supercall
-    check("foo") { Derived().foo() }
-    
-    // delegated call
-    check("foo") { Delegated().foo() }
-    
-    // collection element
-    check("get") { A()[""] }
-    
-    // binary expression
-    check("plus") { A() + A() }
-    
-    // field
-    check("NULL") { A().NULL }
-    
-    // static field
-    check("STATIC_NULL") { A.STATIC_NULL }
-
-    // postfix expression
-    // TODO:
-//    check("inc") { var a = A().a(); a++ }
-
-    // prefix expression
-    check("inc-b") { var a = A.B.b(); a++ }
-
-    // prefix expression
-    check("inc-c") { var a = A.C.c(); a++ }
-
-    // prefix expression
-    check("inc") { var a = A().a(); ++a }
-
-    // prefix expression
-    check("inc-b") { var a = A.B.b(); ++a }
-
-    // prefix expression
-    // TODO:
-//    check("inc-c") { var a = A.C.c(); ++a }
-}
-
-operator fun A.C.inc(): A.C = A.C()
-operator fun <T> T.inc(): T = null as T

compiler/testData/codegen/notNullAssertions/arrayListGet.kt

@@ -1,9 +0,0 @@
-import java.util.ArrayList
-
-fun foo(): Any {
-    val a = ArrayList<String>()
-    return a.get(0)
-}
-
-fun bar(a: ArrayList<String>) {
-}

compiler/testData/codegen/notNullAssertions/assertionForNotNullCaptured.kt

@@ -1,7 +0,0 @@
-class A<T> {
-    fun add(element: T) {}
-}
-
-public fun <R : Any> foo(x: MutableCollection<in R>, block: java.util.AbstractList<R>) {
-    x.add(block.get(0))
-}

compiler/testData/codegen/notNullAssertions/assertionForNotNullTypeParam.kt

@@ -1 +0,0 @@
-fun <T : Any> foo(t: T) = t

compiler/testData/codegen/notNullAssertions/doGenerateParamAssertions.java

@@ -1,17 +0,0 @@
-package test;
-
-import org.jetbrains.annotations.NotNull;
-
-public abstract class doGenerateParamAssertions<Type> {
-
-    public abstract void doTest(@NotNull Type s);
-    
-    public static void runTest(doGenerateParamAssertions a) {
-        try {
-            a.doTest(null);
-        } catch (IllegalArgumentException e) {
-            return;
-        }
-        throw new AssertionError("Fail: IllegalArgumentException expected");
-    }
-}

compiler/testData/codegen/notNullAssertions/doGenerateParamAssertions.kt

@@ -1,14 +0,0 @@
-import test.doGenerateParamAssertions as C
-
-class TestString : C<String>() {
-    override fun doTest(s: String) { }
-}
-
-class TestUnit : C<Unit>() {
-    override fun doTest(s: Unit) { }
-}
-
-fun doTest() {
-    C.runTest(TestString())
-    C.runTest(TestUnit())
-}

compiler/testData/codegen/notNullAssertions/doNotGenerateParamAssertions.kt

@@ -1,4 +0,0 @@
-class A {
-    fun foo(s: String) {
-    }
-}

compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.java

@@ -1,18 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-class A<T, U> {
-    @NotNull
-    T foo() { return null; }
-}
-
-class B<T> extends A<T, Integer> {
-    @Override
-    @NotNull
-    T foo() { return null; }
-}
-
-class C extends B<String> {
-    @Override
-    @NotNull
-    String foo() { return null; }
-}

compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.kt

@@ -1,5 +0,0 @@
-internal fun bar(a: A<String, Int>, b: B<String>, c: C) {
-    val sa: String = a.foo()
-    val sb: String = b.foo()
-    val sc: String = c.foo()
-}

compiler/testData/codegen/notNullAssertions/noAssertionForNullableCaptured.kt

@@ -1,7 +0,0 @@
-class A<T> {
-    fun add(element: T) {}
-}
-
-public fun <R> foo(x: MutableCollection<in R>, block: () -> R) {
-    x.add(block())
-}

compiler/testData/codegen/notNullAssertions/noAssertionForNullableGenericMethod.kt

@@ -1,3 +0,0 @@
-fun <T> foo(a: List<T>) {
-    val t: T = a.get(0)
-}

compiler/testData/codegen/notNullAssertions/noAssertionForNullableGenericMethodCall.kt

@@ -1,7 +0,0 @@
-import java.util.HashMap
-
-class A<T: Any> {
-    fun main() {
-        HashMap<String, T>()[""]
-    }
-}

compiler/testData/codegen/notNullAssertions/noAssertionForPrivateMethod.kt

@@ -1,4 +0,0 @@
-class A {
-    private fun foo(s: String) {
-    }
-}