Remove leftovers of platformName and platformStatic in test data

Drop unnecessary imports, rename some tests

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.java

@@ -0,0 +1,11 @@
+package test;
+
+class Test {
+
+    public static void main(String[] args) {
+        A.test1();
+        A.test2();
+        A.test4("");
+    }
+
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt

@@ -0,0 +1,36 @@
+package test
+
+class A {
+
+    companion object {
+        val b: String = "OK"
+
+        @JvmStatic fun test1() {
+            b
+            test2()
+            test3()
+            "".test4()
+        }
+
+        @JvmStatic fun test2() {
+            b
+        }
+
+        fun test3() {
+
+        }
+
+        @JvmStatic fun String.test4() {
+            b
+        }
+    }
+}
+
+fun main(args: Array<String>) {
+    A.test1()
+    A.test2()
+    A.test3()
+    with(A) {
+        A.test1()
+    }
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt

@@ -0,0 +1,23 @@
+package test
+
+public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
+
+public final class A {
+    public constructor A()
+
+    public companion object Companion {
+        private constructor Companion()
+        public final val b: kotlin.String
+        @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
+        @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
+        public final fun test3(): kotlin.Unit
+        @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
+    }
+}
+
+public/*package*/ open class Test {
+    public/*package*/ constructor Test()
+
+    // Static members
+    public open fun main(/*0*/ kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.java

@@ -0,0 +1,10 @@
+package test;
+
+class Test {
+
+    public static void main(String[] args) {
+        A.getB();
+        A.getC(new A());
+    }
+
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt

@@ -0,0 +1,19 @@
+package test
+
+class A {
+    companion object {
+        @JvmStatic val b: String = "OK"
+
+        var A.c: String
+            @JvmStatic get() = "OK"
+            @JvmStatic set(t: String) {}
+    }
+}
+
+fun main(args: Array<String>) {
+    A.b
+    with(A) {
+        A().c
+        A().c = "123"
+    }
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt

@@ -0,0 +1,20 @@
+package test
+
+public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
+
+public final class A {
+    public constructor A()
+
+    public companion object Companion {
+        private constructor Companion()
+        @kotlin.jvm.JvmStatic() public final val b: kotlin.String
+        public final var test.A.c: kotlin.String
+    }
+}
+
+public/*package*/ open class Test {
+    public/*package*/ constructor Test()
+
+    // Static members
+    public open fun main(/*0*/ kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.java

@@ -0,0 +1,11 @@
+package test;
+
+class Test {
+
+    public static void main(String[] args) {
+        A.test1();
+        A.test2();
+        A.test4("");
+    }
+
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt

@@ -0,0 +1,34 @@
+package test
+
+object A {
+
+    val b: String = "OK"
+
+    @JvmStatic fun test1() {
+        b
+        test2()
+        test3()
+        "".test4()
+    }
+
+    @JvmStatic fun test2() {
+        b
+    }
+
+    fun test3() {
+
+    }
+
+    @JvmStatic fun String.test4() {
+        b
+    }
+}
+
+fun main(args: Array<String>) {
+    A.test1()
+    A.test2()
+    A.test3()
+    with(A) {
+        A.test1()
+    }
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt

@@ -0,0 +1,19 @@
+package test
+
+public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
+
+public object A {
+    private constructor A()
+    public final val b: kotlin.String
+    @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
+    @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
+    public final fun test3(): kotlin.Unit
+    @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
+}
+
+public/*package*/ open class Test {
+    public/*package*/ constructor Test()
+
+    // Static members
+    public open fun main(/*0*/ kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.java

@@ -0,0 +1,10 @@
+package test;
+
+class Test {
+
+    public static void main(String[] args) {
+        A.getB();
+        A.getC(A.INSTANCE);
+    }
+
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt

@@ -0,0 +1,18 @@
+package test
+
+object A {
+    @JvmStatic val b: String = "OK"
+
+    var A.c: String
+        @JvmStatic get() = "OK"
+        @JvmStatic set(t: String) {}
+
+}
+
+fun main(args: Array<String>) {
+    A.b
+    with(A) {
+        A.c
+        A.c = "123"
+    }
+}

compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt

@@ -0,0 +1,16 @@
+package test
+
+public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
+
+public object A {
+    private constructor A()
+    @kotlin.jvm.JvmStatic() public final val b: kotlin.String
+    public final var test.A.c: kotlin.String
+}
+
+public/*package*/ open class Test {
+    public/*package*/ constructor Test()
+
+    // Static members
+    public open fun main(/*0*/ kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+}