Migrate bytecode text tests to multi-file framework

Get rid of BytecodeTextMultifileTestGenerated

compiler/testData/codegen/bytecodeText/inlineJavaStaticFields.kt

@@ -1,3 +1,32 @@
+// FILE: JClass.java
+
+import org.jetbrains.annotations.NotNull;
+
+public class JClass {
+    public final static int PrimitiveInt = 9000;
+    public final static int BigPrimitiveInt = 59000;
+    public final static long PrimitiveLong = 100000;
+    public final static short PrimitiveShort = 901;
+    public final static boolean PrimitiveBool = false;
+    public final static float PrimitiveFloat = 36.6;
+    public final static double PrimitiveDouble = 42.4242;
+    public final static byte PrimitiveByte = -8;
+    public final static char PrimitiveChar = 'K';
+    public final static String Str = ":J";
+
+    @Nullable
+    public final static String StrNullable = "nullable";
+
+    @NotNull
+    public final static Integer BoxedInt = 9500;
+
+    public static int NonFinal = 9700;
+
+    public final int NonStatic = 9800;
+}
+
+// FILE: test.kt
+
 object KoKobject {
     @JvmField
     val JvmStatic: Int = 1
@@ -31,7 +60,6 @@ fun test() {
     KoKobject.JvmStaticString
 }
 
-// @TestKt.class:
 // 1 LDC -2147483648
 // 1 LDC 9223372036854775807
 // 1 SIPUSH 9000
@@ -51,4 +79,4 @@ fun test() {
 // 1 GETSTATIC KoKobject.JvmStatic : I
 // 1 GETSTATIC KoKobject.JvmStaticString : Ljava/lang/String
 // 3 POP2
-// 18 POP
+// 18 POP

compiler/testData/codegen/bytecodeText/javaStatics.kt

@@ -1,3 +1,23 @@
+// FILE: Child.java
+
+class Child extends Parent {
+    public static int b = 3;
+    public static int c = 4;
+    public static void bar() {}
+    public static void baz() {}
+}
+
+// FILE: Parent.java
+
+class Parent {
+    public static int a = 1;
+    public static int b = 2;
+    public static void foo() {}
+    public static void baz() {}
+}
+
+// FILE: test.kt
+
 fun test() {
     Parent.a
     Parent.b
@@ -12,7 +32,6 @@ fun test() {
     Child.baz()
 }
 
-// @TestKt.class:
 // 1 GETSTATIC Parent.a : I
 // 1 GETSTATIC Parent.b : I
 // 1 INVOKESTATIC Parent.foo()

compiler/testData/codegen/bytecodeText/partMembersCall.kt

@@ -1,3 +1,13 @@
+// FILE: otherFile.kt
+
+@file:[JvmName("Util") JvmMultifileClass]
+package test
+
+internal fun internalInOtherFile() {}
+public fun publicInOtherFile() {}
+
+// FILE: thisFile.kt
+
 @file:[JvmName("Util") JvmMultifileClass]
 package test
 
@@ -20,4 +30,4 @@ public fun publicInThisFile() {}
 // 1 INVOKESTATIC test/Util.internalInThisFile
 // 1 INVOKESTATIC test/Util.publicInThisFile
 // 1 INVOKESTATIC test/Util.internalInOtherFile
-// 1 INVOKESTATIC test/Util.publicInOtherFile
+// 1 INVOKESTATIC test/Util.publicInOtherFile

compiler/testData/codegen/bytecodeText/partMembersInline.kt

@@ -1,3 +1,12 @@
+// FILE: otherFile.kt
+
+@file:[JvmName("Util") JvmMultifileClass]
+package test
+
+public fun publicInOtherFile() {}
+
+// FILE: thisFile.kt
+
 @file:[JvmName("Util") JvmMultifileClass]
 package test
 
@@ -15,4 +24,4 @@ fun bar() {
 
 // @test/Util__ThisFileKt.class:
 // 2 INVOKESTATIC test/Util.publicInThisFile
-// 2 INVOKESTATIC test/Util.publicInOtherFile
+// 2 INVOKESTATIC test/Util.publicInOtherFile

compiler/testData/codegen/bytecodeText/preEvaluateInlineJavaStaticFields.kt

@@ -1,3 +1,32 @@
+// FILE: JClass.java
+
+import org.jetbrains.annotations.NotNull;
+
+public class JClass {
+    public final static int PrimitiveInt = 9000;
+    public final static int BigPrimitiveInt = 59000;
+    public final static long PrimitiveLong = 100000;
+    public final static short PrimitiveShort = 901;
+    public final static boolean PrimitiveBool = false;
+    public final static float PrimitiveFloat = 36.6;
+    public final static double PrimitiveDouble = 42.4242;
+    public final static byte PrimitiveByte = -8;
+    public final static char PrimitiveChar = 'K';
+    public final static String Str = ":J";
+
+    @Nullable
+    public final static String StrNullable = "nullable";
+
+    @NotNull
+    public final static Integer BoxedInt = 9500;
+
+    public static int NonFinal = 9700;
+
+    public final int NonStatic = 9800;
+}
+
+// FILE: test.kt
+
 enum class EClass {
     VALUE
 }
@@ -34,7 +63,6 @@ fun test() {
     "res8: " + EClass::class
 }
 
-// @TestKt.class:
 // 1 LDC "res1: -2147483648 9223372036854775807 9000 59000 -8 K 100000 901 false 36.6 42.4242 :J nullable"
 // 1 LDC "res2: "
 // 1 LDC "res3: "

compiler/testData/codegen/bytecodeTextMultifile/inlineJavaStaticFields/JClass.java

@@ -1,24 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-public class JClass {
-    public final static int PrimitiveInt = 9000;
-    public final static int BigPrimitiveInt = 59000;
-    public final static long PrimitiveLong = 100000;
-    public final static short PrimitiveShort = 901;
-    public final static boolean PrimitiveBool = false;
-    public final static float PrimitiveFloat = 36.6;
-    public final static double PrimitiveDouble = 42.4242;
-    public final static byte PrimitiveByte = -8;
-    public final static char PrimitiveChar = 'K';
-    public final static String Str = ":J";
-
-    @Nullable
-    public final static String StrNullable = "nullable";
-
-    @NotNull
-    public final static Integer BoxedInt = 9500;
-
-    public static int NonFinal = 9700;
-
-    public final int NonStatic = 9800;
-}

compiler/testData/codegen/bytecodeTextMultifile/javaStatics/Child.java

@@ -1,6 +0,0 @@
-class Child extends Parent {
-    public static int b = 3;
-    public static int c = 4;
-    public static void bar() {}
-    public static void baz() {}
-}

compiler/testData/codegen/bytecodeTextMultifile/javaStatics/Parent.java

@@ -1,6 +0,0 @@
-class Parent {
-    public static int a = 1;
-    public static int b = 2;
-    public static void foo() {}
-    public static void baz() {}
-}

compiler/testData/codegen/bytecodeTextMultifile/partMembersCall/otherFile.kt

@@ -1,5 +0,0 @@
-@file:[JvmName("Util") JvmMultifileClass]
-package test
-
-internal fun internalInOtherFile() {}
-public fun publicInOtherFile() {}

compiler/testData/codegen/bytecodeTextMultifile/partMembersInline/otherFile.kt

@@ -1,4 +0,0 @@
-@file:[JvmName("Util") JvmMultifileClass]
-package test
-
-public fun publicInOtherFile() {}

compiler/testData/codegen/bytecodeTextMultifile/preEvaluateInlineJavaStaticFields/JClass.java

@@ -1,24 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-public class JClass {
-    public final static int PrimitiveInt = 9000;
-    public final static int BigPrimitiveInt = 59000;
-    public final static long PrimitiveLong = 100000;
-    public final static short PrimitiveShort = 901;
-    public final static boolean PrimitiveBool = false;
-    public final static float PrimitiveFloat = 36.6;
-    public final static double PrimitiveDouble = 42.4242;
-    public final static byte PrimitiveByte = -8;
-    public final static char PrimitiveChar = 'K';
-    public final static String Str = ":J";
-
-    @Nullable
-    public final static String StrNullable = "nullable";
-
-    @NotNull
-    public final static Integer BoxedInt = 9500;
-
-    public static int NonFinal = 9700;
-
-    public final int NonStatic = 9800;
-}