[kotlin] J2K tests: rename K1 tests

KTIJ-28714

(cherry picked from commit 7668f881f6e74a2021980e1839d254b7d76e0963)

GitOrigin-RevId: 808e5784ceaa358d5bea8a117507114c7a2ddba1

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1JavaToKotlinConverterMultiFileTest.kt

@@ -4,4 +4,4 @@ package org.jetbrains.kotlin.nj2k
 
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
 
-abstract class AbstractNewJavaToKotlinConverterMultiFileTest : AbstractJavaToKotlinConverterMultiFileTest()
+abstract class AbstractK1JavaToKotlinConverterMultiFileTest : AbstractJavaToKotlinConverterMultiFileTest()

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1JavaToKotlinConverterPartialTest.kt

@@ -4,4 +4,4 @@ package org.jetbrains.kotlin.nj2k
 
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterPartialTest
 
-abstract class AbstractNewJavaToKotlinConverterPartialTest : AbstractJavaToKotlinConverterPartialTest()
+abstract class AbstractK1JavaToKotlinConverterPartialTest : AbstractJavaToKotlinConverterPartialTest()

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1JavaToKotlinConverterSingleFileFullJDKTest.kt

@@ -3,4 +3,4 @@ package org.jetbrains.kotlin.nj2k
 
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileFullJDKTest
 
-abstract class AbstractNewJavaToKotlinConverterSingleFileFullJDKTest : AbstractJavaToKotlinConverterSingleFileFullJDKTest()
+abstract class AbstractK1JavaToKotlinConverterSingleFileFullJDKTest : AbstractJavaToKotlinConverterSingleFileFullJDKTest()

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1JavaToKotlinConverterSingleFileTest.kt

@@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
 import org.jetbrains.kotlin.types.FlexibleTypeImpl
 
-abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() {
+abstract class AbstractK1JavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() {
     override fun doTest(javaPath: String) {
         // TODO KTIJ-5630 (K1 only)
         FlexibleTypeImpl.RUN_SLOW_ASSERTIONS = !javaPath.endsWith("typeParameters/rawTypeCast.java")

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1JavaToKotlinCopyPasteConversionTest.kt

@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.idea.base.test.KotlinRoot
 import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import java.io.File
 
-abstract class AbstractNewJavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() {
+abstract class AbstractK1JavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() {
     override val testDataDirectory: File
         get() = KotlinRoot.DIR.resolve("j2k/shared/tests/testData/copyPaste")
 

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/AbstractK1TextJavaToKotlinCopyPasteConversionTest.kt

@@ -4,6 +4,6 @@ package org.jetbrains.kotlin.nj2k
 
 import org.jetbrains.kotlin.idea.conversion.copy.AbstractTextJavaToKotlinCopyPasteConversionTest
 
-abstract class AbstractTextNewJavaToKotlinCopyPasteConversionTest : AbstractTextJavaToKotlinCopyPasteConversionTest() {
+abstract class AbstractK1TextJavaToKotlinCopyPasteConversionTest : AbstractTextJavaToKotlinCopyPasteConversionTest() {
     override fun isNewJ2K(): Boolean = true
 }

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1JavaToKotlinConverterMultiFileTestGenerated.java

@@ -19,7 +19,7 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/multiFile")
-public class NewJavaToKotlinConverterMultiFileTestGenerated extends AbstractNewJavaToKotlinConverterMultiFileTest {
+public class K1JavaToKotlinConverterMultiFileTestGenerated extends AbstractK1JavaToKotlinConverterMultiFileTest {
     @java.lang.Override
     @org.jetbrains.annotations.NotNull
     public final KotlinPluginMode getPluginMode() {

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1JavaToKotlinConverterPartialTestGenerated.java

@@ -19,10 +19,10 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/partialConverter")
-public abstract class NewJavaToKotlinConverterPartialTestGenerated extends AbstractNewJavaToKotlinConverterPartialTest {
+public abstract class K1JavaToKotlinConverterPartialTestGenerated extends AbstractK1JavaToKotlinConverterPartialTest {
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/partialConverter/field")
-    public static class Field extends AbstractNewJavaToKotlinConverterPartialTest {
+    public static class Field extends AbstractK1JavaToKotlinConverterPartialTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -101,7 +101,7 @@ public abstract class NewJavaToKotlinConverterPartialTestGenerated extends Abstr
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/partialConverter/function")
-    public static class Function extends AbstractNewJavaToKotlinConverterPartialTest {
+    public static class Function extends AbstractK1JavaToKotlinConverterPartialTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1JavaToKotlinConverterSingleFileFullJDKTestGenerated.java

@@ -19,10 +19,10 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/fullJDK")
-public abstract class NewJavaToKotlinConverterSingleFileFullJDKTestGenerated extends AbstractNewJavaToKotlinConverterSingleFileFullJDKTest {
+public abstract class K1JavaToKotlinConverterSingleFileFullJDKTestGenerated extends AbstractK1JavaToKotlinConverterSingleFileFullJDKTest {
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/fullJDK/collections")
-    public static class Collections extends AbstractNewJavaToKotlinConverterSingleFileFullJDKTest {
+    public static class Collections extends AbstractK1JavaToKotlinConverterSingleFileFullJDKTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -61,7 +61,7 @@ public abstract class NewJavaToKotlinConverterSingleFileFullJDKTestGenerated ext
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/fullJDK/enum")
-    public static class Enum extends AbstractNewJavaToKotlinConverterSingleFileFullJDKTest {
+    public static class Enum extends AbstractK1JavaToKotlinConverterSingleFileFullJDKTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -80,7 +80,7 @@ public abstract class NewJavaToKotlinConverterSingleFileFullJDKTestGenerated ext
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/fullJDK/issues")
-    public static class Issues extends AbstractNewJavaToKotlinConverterSingleFileFullJDKTest {
+    public static class Issues extends AbstractK1JavaToKotlinConverterSingleFileFullJDKTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1JavaToKotlinConverterSingleFileTestGenerated.java

@@ -19,10 +19,10 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/newJ2k")
-public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNewJavaToKotlinConverterSingleFileTest {
+public abstract class K1JavaToKotlinConverterSingleFileTestGenerated extends AbstractK1JavaToKotlinConverterSingleFileTest {
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/annotations")
-    public static class Annotations extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Annotations extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -216,7 +216,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/anonymousBlock")
-    public static class AnonymousBlock extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class AnonymousBlock extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -305,7 +305,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/anonymousClass")
-    public static class AnonymousClass extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class AnonymousClass extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -334,7 +334,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/arrayAccessExpression")
-    public static class ArrayAccessExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ArrayAccessExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -368,7 +368,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/arrayInitializerExpression")
-    public static class ArrayInitializerExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ArrayInitializerExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -447,7 +447,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/arrayType")
-    public static class ArrayType extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ArrayType extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -516,7 +516,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/assertStatement")
-    public static class AssertStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class AssertStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -555,7 +555,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/assignmentExpression")
-    public static class AssignmentExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class AssignmentExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -704,7 +704,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/binaryExpression")
-    public static class BinaryExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class BinaryExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -848,7 +848,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/blocks")
-    public static class Blocks extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Blocks extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -872,7 +872,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/boxedType")
-    public static class BoxedType extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class BoxedType extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -961,7 +961,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/breakStatement")
-    public static class BreakStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class BreakStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -985,7 +985,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/callChainExpression")
-    public static class CallChainExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class CallChainExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1029,7 +1029,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/caseConversion")
-    public static class CaseConversion extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class CaseConversion extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1053,7 +1053,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/class")
-    public static class Class extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Class extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1252,7 +1252,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/classExpression")
-    public static class ClassExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ClassExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1286,7 +1286,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/comments")
-    public static class Comments extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Comments extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1395,7 +1395,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/conditionalExpression")
-    public static class ConditionalExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ConditionalExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1414,7 +1414,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/constructors")
-    public static class Constructors extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Constructors extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1653,7 +1653,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/continueStatement")
-    public static class ContinueStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ContinueStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1677,7 +1677,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/declarationStatement")
-    public static class DeclarationStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class DeclarationStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -1721,7 +1721,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/detectProperties")
-    public static class DetectProperties extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class DetectProperties extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2120,7 +2120,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/doWhileStatement")
-    public static class DoWhileStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class DoWhileStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2159,7 +2159,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/docComments")
-    public static class DocComments extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class DocComments extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2248,7 +2248,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/enum")
-    public static class Enum extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Enum extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2387,7 +2387,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/equals")
-    public static class Equals extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Equals extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2436,7 +2436,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/explicitApiMode")
-    public static class ExplicitApiMode extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ExplicitApiMode extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2460,7 +2460,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/field")
-    public static class Field extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Field extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2554,7 +2554,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/for")
-    public static class For extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class For extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2838,7 +2838,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/foreachStatement")
-    public static class ForeachStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ForeachStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2882,7 +2882,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/formatting")
-    public static class Formatting extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Formatting extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -2961,7 +2961,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/function")
-    public static class Function extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Function extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3200,7 +3200,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/functionalInterfaces")
-    public static class FunctionalInterfaces extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class FunctionalInterfaces extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3254,7 +3254,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/identifier")
-    public static class Identifier extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Identifier extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3288,7 +3288,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/ifStatement")
-    public static class IfStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class IfStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3342,7 +3342,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/implicitCasts")
-    public static class ImplicitCasts extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ImplicitCasts extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3426,7 +3426,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/importStatement")
-    public static class ImportStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ImportStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3465,7 +3465,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/inheritance")
-    public static class Inheritance extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Inheritance extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3504,7 +3504,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/interface")
-    public static class Interface extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Interface extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3578,7 +3578,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/invalidCode")
-    public static class InvalidCode extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class InvalidCode extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3612,7 +3612,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/isOperator")
-    public static class IsOperator extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class IsOperator extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -3641,7 +3641,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/issues")
-    public static class Issues extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Issues extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4070,7 +4070,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/javaStandardMethods")
-    public static class JavaStandardMethods extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class JavaStandardMethods extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4099,7 +4099,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/javaStreamsApi")
-    public static class JavaStreamsApi extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class JavaStreamsApi extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4158,7 +4158,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/kotlinApiAccess")
-    public static class KotlinApiAccess extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class KotlinApiAccess extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4267,7 +4267,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/labelStatement")
-    public static class LabelStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class LabelStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4286,7 +4286,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/lambda")
-    public static class Lambda extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Lambda extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4310,7 +4310,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/libraryUsage")
-    public static class LibraryUsage extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class LibraryUsage extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4334,7 +4334,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/list")
-    public static class List extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class List extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4358,7 +4358,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/literalExpression")
-    public static class LiteralExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class LiteralExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4467,7 +4467,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/localVariable")
-    public static class LocalVariable extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class LocalVariable extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4526,7 +4526,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/methodCallExpression")
-    public static class MethodCallExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class MethodCallExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4655,7 +4655,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/misc")
-    public static class Misc extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Misc extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4699,7 +4699,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/mutableCollections")
-    public static class MutableCollections extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class MutableCollections extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4778,7 +4778,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/newClassExpression")
-    public static class NewClassExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class NewClassExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -4867,10 +4867,10 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures")
-    public abstract static class NewJavaFeatures extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public abstract static class NewJavaFeatures extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures/enhancedSwitchStatement")
-        public static class EnhancedSwitchStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class EnhancedSwitchStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -4894,7 +4894,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures/patternMatching")
-        public static class PatternMatching extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class PatternMatching extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -4928,7 +4928,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures/recordClass")
-        public static class RecordClass extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class RecordClass extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -5022,7 +5022,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures/switchExpression")
-        public static class SwitchExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class SwitchExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -5121,7 +5121,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures/textBlocks")
-        public static class TextBlocks extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class TextBlocks extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -5185,7 +5185,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../../shared/tests/testData/newJ2k/newJavaFeatures")
-        public static class Uncategorized extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        public static class Uncategorized extends AbstractK1JavaToKotlinConverterSingleFileTest {
             @java.lang.Override
             @org.jetbrains.annotations.NotNull
             public final KotlinPluginMode getPluginMode() {
@@ -5205,7 +5205,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/nullability")
-    public static class Nullability extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Nullability extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5484,7 +5484,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/nullabilityGenerics")
-    public static class NullabilityGenerics extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class NullabilityGenerics extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5633,7 +5633,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/objectLiteral")
-    public static class ObjectLiteral extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ObjectLiteral extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5672,7 +5672,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/overloads")
-    public static class Overloads extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Overloads extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5726,7 +5726,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/packageStatement")
-    public static class PackageStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PackageStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5745,7 +5745,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/parenthesizedExpression")
-    public static class ParenthesizedExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ParenthesizedExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5799,7 +5799,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/polyadicExpression")
-    public static class PolyadicExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PolyadicExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -5843,7 +5843,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/postProcessing")
-    public static class PostProcessing extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PostProcessing extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6017,7 +6017,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/postfixOperator")
-    public static class PostfixOperator extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PostfixOperator extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6041,7 +6041,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/preAndPostprocessorExtensions")
-    public static class PreAndPostprocessorExtensions extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PreAndPostprocessorExtensions extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6065,7 +6065,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/prefixOperator")
-    public static class PrefixOperator extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class PrefixOperator extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6109,7 +6109,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/projections")
-    public static class Projections extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Projections extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6128,7 +6128,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/protected")
-    public static class Protected extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Protected extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6177,7 +6177,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/rawGenerics")
-    public static class RawGenerics extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class RawGenerics extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6211,7 +6211,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/returnStatement")
-    public static class ReturnStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ReturnStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6255,7 +6255,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/settings")
-    public static class Settings extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Settings extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6289,7 +6289,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/simplifyNegatedBinaryExpression")
-    public static class SimplifyNegatedBinaryExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class SimplifyNegatedBinaryExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6333,7 +6333,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/staticMembers")
-    public static class StaticMembers extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class StaticMembers extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6392,7 +6392,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/strings")
-    public static class Strings extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Strings extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6411,7 +6411,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/superExpression")
-    public static class SuperExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class SuperExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6460,7 +6460,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/switch")
-    public static class Switch extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Switch extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6554,7 +6554,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/synchronizedStatement")
-    public static class SynchronizedStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class SynchronizedStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6573,7 +6573,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/thisExpression")
-    public static class ThisExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ThisExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6597,7 +6597,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/throwStatement")
-    public static class ThrowStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ThrowStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6616,7 +6616,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/toArray")
-    public static class ToArray extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ToArray extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6635,7 +6635,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/toKotlinClasses")
-    public static class ToKotlinClasses extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class ToKotlinClasses extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6679,7 +6679,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/tryStatement")
-    public static class TryStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class TryStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6718,7 +6718,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/tryWithResource")
-    public static class TryWithResource extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class TryWithResource extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6792,7 +6792,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/typeCastExpression")
-    public static class TypeCastExpression extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class TypeCastExpression extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6896,7 +6896,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/typeParameters")
-    public static class TypeParameters extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class TypeParameters extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -6985,7 +6985,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/types")
-    public static class Types extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Types extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -7029,7 +7029,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/varArg")
-    public static class VarArg extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class VarArg extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -7058,7 +7058,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/visibility")
-    public static class Visibility extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class Visibility extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {
@@ -7137,7 +7137,7 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
 
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/whileStatement")
-    public static class WhileStatement extends AbstractNewJavaToKotlinConverterSingleFileTest {
+    public static class WhileStatement extends AbstractK1JavaToKotlinConverterSingleFileTest {
         @java.lang.Override
         @org.jetbrains.annotations.NotNull
         public final KotlinPluginMode getPluginMode() {

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1JavaToKotlinCopyPasteConversionTestGenerated.java

@@ -19,7 +19,7 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/copyPaste")
-public class NewJavaToKotlinCopyPasteConversionTestGenerated extends AbstractNewJavaToKotlinCopyPasteConversionTest {
+public class K1JavaToKotlinCopyPasteConversionTestGenerated extends AbstractK1JavaToKotlinCopyPasteConversionTest {
     @java.lang.Override
     @org.jetbrains.annotations.NotNull
     public final KotlinPluginMode getPluginMode() {

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/K1TextJavaToKotlinCopyPasteConversionTestGenerated.java

@@ -19,7 +19,7 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 @TestMetadata("../../shared/tests/testData/copyPastePlainText")
-public class TextNewJavaToKotlinCopyPasteConversionTestGenerated extends AbstractTextNewJavaToKotlinCopyPasteConversionTest {
+public class K1TextJavaToKotlinCopyPasteConversionTestGenerated extends AbstractK1TextJavaToKotlinCopyPasteConversionTest {
     @java.lang.Override
     @org.jetbrains.annotations.NotNull
     public final KotlinPluginMode getPluginMode() {

plugins/kotlin/util/test-generator-fe10/test/org/jetbrains/kotlin/fe10/testGenerator/Fe10GenerateTests.kt

@@ -1388,27 +1388,27 @@ private fun assembleWorkspace(): TWorkspace = workspace(KotlinPluginMode.K1) {
     }
 
     testGroup("j2k/k1.new/tests", testDataPath = "../../shared/tests/testData", category = J2K) {
-        testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
+        testClass<AbstractK1JavaToKotlinConverterSingleFileTest> {
             model("newJ2k", pattern = Patterns.forRegex("""^([^.]+)\.java$"""))
         }
 
-        testClass<AbstractNewJavaToKotlinConverterSingleFileFullJDKTest> {
+        testClass<AbstractK1JavaToKotlinConverterSingleFileFullJDKTest> {
             model("fullJDK", pattern = Patterns.forRegex("""^([^.]+)\.java$"""))
         }
 
-        testClass<AbstractNewJavaToKotlinConverterPartialTest> {
+        testClass<AbstractK1JavaToKotlinConverterPartialTest> {
             model("partialConverter", pattern = Patterns.forRegex("""^([^.]+)\.java$"""))
         }
 
-        testClass<AbstractNewJavaToKotlinCopyPasteConversionTest>(commonSuite = false) {
+        testClass<AbstractK1JavaToKotlinCopyPasteConversionTest>(commonSuite = false) {
             model("copyPaste", pattern = Patterns.forRegex("""^([^.]+)\.java$"""))
         }
 
-        testClass<AbstractTextNewJavaToKotlinCopyPasteConversionTest>(commonSuite = false) {
+        testClass<AbstractK1TextJavaToKotlinCopyPasteConversionTest>(commonSuite = false) {
             model("copyPastePlainText", pattern = Patterns.forRegex("""^([^.]+)\.txt$"""))
         }
 
-        testClass<AbstractNewJavaToKotlinConverterMultiFileTest>(commonSuite = false) {
+        testClass<AbstractK1JavaToKotlinConverterMultiFileTest>(commonSuite = false) {
             model("multiFile", pattern = DIRECTORY, isRecursive = false)
         }
     }