From 3a642610604610d289add5b017cc821617876558 Mon Sep 17 00:00:00 2001
From: Alexey Belkov <alexey.belkov@jetbrains.com>
Date: Sat, 16 Mar 2024 11:21:31 +0400
Subject: [PATCH] [kotlin] J2K tests: Remove redundant "//class" comments from
 testdata

"class" is the same as "file" now

GitOrigin-RevId: 78ee93ca8551e68b1f59a2bd15506e67a5eeec49
---
 .../j2k/AbstractJavaToKotlinConverterSingleFileTest.kt     | 7 ++-----
 .../shared/tests/testData/newJ2k/class/abstractClass.java  | 1 -
 .../tests/testData/newJ2k/class/abstractClassShape.java    | 1 -
 .../j2k/shared/tests/testData/newJ2k/class/class.java      | 1 -
 .../tests/testData/newJ2k/class/classWithEmptyMethods.java | 1 -
 .../tests/testData/newJ2k/class/classWithFields.java       | 1 -
 .../testData/newJ2k/class/classWithMultiplyFields.java     | 1 -
 .../j2k/shared/tests/testData/newJ2k/class/emptyClass.java | 1 -
 .../j2k/shared/tests/testData/newJ2k/class/finalClass.java | 1 -
 .../shared/tests/testData/newJ2k/class/genericClass.java   | 1 -
 .../tests/testData/newJ2k/class/innerEmptyClass.java       | 1 -
 .../tests/testData/newJ2k/class/innerStaticClass.java      | 1 -
 .../shared/tests/testData/newJ2k/class/internalClass.java  | 1 -
 .../testData/newJ2k/class/oneStaticFieldOneNonStatic.java  | 1 -
 .../tests/testData/newJ2k/class/oneStaticMethod.java       | 1 -
 .../testData/newJ2k/class/oneStaticMethodOneNonStatic.java | 1 -
 .../shared/tests/testData/newJ2k/class/privateClass.java   | 1 -
 .../shared/tests/testData/newJ2k/class/protectedClass.java | 1 -
 .../shared/tests/testData/newJ2k/class/publicClass.java    | 1 -
 .../tests/testData/newJ2k/class/twoStaticMethod.java       | 1 -
 .../j2k/shared/tests/testData/newJ2k/enum/colorEnum.java   | 1 -
 .../j2k/shared/tests/testData/newJ2k/enum/emptyEnum.java   | 1 -
 .../testData/newJ2k/enum/enumImplementsOneInterface.java   | 1 -
 .../newJ2k/enum/enumImplementsSeveralInterfaces.java       | 1 -
 .../tests/testData/newJ2k/enum/enumWithNameField.java      | 1 -
 .../newJ2k/enum/fieldsWithPrimaryPrivateConstructor.java   | 1 -
 .../shared/tests/testData/newJ2k/enum/internalEnum.java    | 1 -
 .../tests/testData/newJ2k/enum/overrideToString.java       | 1 -
 .../testData/newJ2k/enum/primaryPrivateConstructor.java    | 1 -
 .../j2k/shared/tests/testData/newJ2k/enum/privateEnum.java | 1 -
 .../shared/tests/testData/newJ2k/enum/protectedEnum.java   | 1 -
 .../j2k/shared/tests/testData/newJ2k/enum/publicEnum.java  | 1 -
 .../tests/testData/newJ2k/enum/runnableImplementation.java | 1 -
 .../shared/tests/testData/newJ2k/enum/typeSafeEnum.java    | 1 -
 .../tests/testData/newJ2k/interface/abstractInterface.java | 1 -
 .../tests/testData/newJ2k/interface/emptyInterface.java    | 1 -
 .../extendsOneClassAndImplementsSeveralInterfaces.java     | 1 -
 .../testData/newJ2k/interface/interfaceWithFields.java     | 1 -
 .../newJ2k/interface/interfaceWithMethodDeclaration.java   | 1 -
 .../newJ2k/interface/interfaceWithStaticFields.java        | 1 -
 .../tests/testData/newJ2k/interface/internalInterface.java | 1 -
 .../tests/testData/newJ2k/interface/privateInterface.java  | 1 -
 .../testData/newJ2k/interface/protectedInterface.java      | 1 -
 .../tests/testData/newJ2k/interface/publicInterface.java   | 1 -
 .../testData/newJ2k/newClassExpression/classWithParam.java | 1 -
 .../newJ2k/newClassExpression/classWithParams.java         | 1 -
 .../newJ2k/newClassExpression/classWithoutBody.java        | 1 -
 .../typeParameters/complexExampleWithClassExtending.java   | 1 -
 .../complexExampleWithClassMultiplyExtending.java          | 1 -
 .../tests/testData/newJ2k/typeParameters/genericClass.java | 1 -
 50 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
index a4c1c8e276f5..64ff3324ed54 100644
--- a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
+++ b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import java.io.File
 import java.util.regex.Pattern
 
-private val testHeaderPattern: Pattern = Pattern.compile("//(expression|statement|method|class)\n")
+private val testHeaderPattern: Pattern = Pattern.compile("//(expression|statement|method)\n")
 
 abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterTest() {
     override fun setUp() {
@@ -106,11 +106,8 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli
             "expression" -> expressionToKotlin(javaCode, settings)
             "statement" -> statementToKotlin(javaCode, settings)
             "method" -> methodToKotlin(javaCode, settings)
-            "class" -> fileToKotlin(javaCode, settings)
             "file" -> fileToKotlin(javaCode, settings)
-            else -> throw IllegalStateException(
-                "Specify what is it: file, class, method, statement or expression using the first line of test data file"
-            )
+            else -> error("Specify what it is: method, statement or expression using the first line of test data file")
         }
 
     open fun fileToKotlin(text: String, settings: ConverterSettings): String {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClass.java
index aeca5891800d..0ff487db135a 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClass.java
@@ -1,4 +1,3 @@
-//class
 abstract class A { 
   abstract void callme();
 
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClassShape.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClassShape.java
index 321b140f6034..3db4e229ce05 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClassShape.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/abstractClassShape.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 abstract class Shape {
 	public String color;
 	public Shape() {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/class.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/class.java
index 6efabff9cf5f..183c3f5b3be0 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/class.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/class.java
@@ -1,2 +1 @@
-//class
 class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithEmptyMethods.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithEmptyMethods.java
index 2b8a4a333167..954651143b04 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithEmptyMethods.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithEmptyMethods.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 final class T {void main() {}int i() {}String s() {}}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithFields.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithFields.java
index 6274b19be986..3a9adf76f652 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithFields.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithFields.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 final class T {String a = "abc";int b = 10;}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithMultiplyFields.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithMultiplyFields.java
index 496ee2589163..0e37458029fa 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithMultiplyFields.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/classWithMultiplyFields.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 final class T {String a, b, c = "abc";}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/emptyClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/emptyClass.java
index b93de2b2c460..151119ab6a76 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/emptyClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/emptyClass.java
@@ -1,2 +1 @@
-//class
 final class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/finalClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/finalClass.java
index d374f552643a..5071bba99313 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/finalClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/finalClass.java
@@ -1,2 +1 @@
-//class
 final class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/genericClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/genericClass.java
index 44a991acb0cc..b18123be7cb1 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/genericClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/genericClass.java
@@ -1,2 +1 @@
-//class
 final class Entry<K, V> {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerEmptyClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerEmptyClass.java
index 96af076887e8..4f25991140cb 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerEmptyClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerEmptyClass.java
@@ -1,2 +1 @@
-//class
 final class A { final class B {} }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerStaticClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerStaticClass.java
index b11106f661e8..d0885630764e 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerStaticClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/innerStaticClass.java
@@ -1,2 +1 @@
-//class
 final class S { static class Inner {} }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/internalClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/internalClass.java
index 6efabff9cf5f..183c3f5b3be0 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/internalClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/internalClass.java
@@ -1,2 +1 @@
-//class
 class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticFieldOneNonStatic.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticFieldOneNonStatic.java
index dad23b913181..0e0b14688a47 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticFieldOneNonStatic.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticFieldOneNonStatic.java
@@ -1,2 +1 @@
-//class
 final class S { boolean sB() { return true; } static int myI = 10; }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethod.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethod.java
index a23e0cf0a616..98884d114b79 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethod.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethod.java
@@ -1,2 +1 @@
-//class
 final class S { static boolean staticF() { return true; } }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethodOneNonStatic.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethodOneNonStatic.java
index e9f3e081e54d..4c6915861c5e 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethodOneNonStatic.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/oneStaticMethodOneNonStatic.java
@@ -1,2 +1 @@
-//class
 final class S { boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/privateClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/privateClass.java
index 8626c96eeb5a..91cc7a0e9370 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/privateClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/privateClass.java
@@ -1,2 +1 @@
-//class
 private class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/protectedClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/protectedClass.java
index ba73b0f9a934..d27e53f50813 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/protectedClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/protectedClass.java
@@ -1,2 +1 @@
-//class
 protected class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/publicClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/publicClass.java
index 108aa7b8cf4c..099aac22fd36 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/publicClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/publicClass.java
@@ -1,2 +1 @@
-//class
 public class Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/twoStaticMethod.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/twoStaticMethod.java
index 3087adf7ef7e..b69b1398e174 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/twoStaticMethod.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/twoStaticMethod.java
@@ -1,2 +1 @@
-//class
 final class S { static boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/colorEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/colorEnum.java
index d3b88e2a51e6..8c0d98827ffb 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/colorEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/colorEnum.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 package demo;
 
 enum MyEnum {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/emptyEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/emptyEnum.java
index 584f167b9503..6374d13e5e58 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/emptyEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/emptyEnum.java
@@ -1,2 +1 @@
-//class
 enum A {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsOneInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsOneInterface.java
index 4566a73f3ca3..c2e20825bfee 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsOneInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsOneInterface.java
@@ -1,2 +1 @@
-//class
 enum A implements I {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsSeveralInterfaces.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsSeveralInterfaces.java
index 482d116a49f2..0334953a275c 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsSeveralInterfaces.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumImplementsSeveralInterfaces.java
@@ -1,2 +1 @@
-//class
 enum A implements I0, I1, I2 {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumWithNameField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumWithNameField.java
index 1a850f01715d..5ce8b15724ea 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumWithNameField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/enumWithNameField.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 enum E { I; private String name; }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.java
index bbdaa98db08e..9d8d68e57752 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 enum Color {
     WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);
 
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/internalEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/internalEnum.java
index df413fc06fbc..5ac159fa355f 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/internalEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/internalEnum.java
@@ -1,2 +1 @@
-//class
 enum Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/overrideToString.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/overrideToString.java
index ce714f2d3e85..0101f40d1087 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/overrideToString.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/overrideToString.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 enum Color { WHITE, BLACK, RED, YELLOW, BLUE;@Override public String toString() {  return "COLOR";}}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/primaryPrivateConstructor.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/primaryPrivateConstructor.java
index da6215acee39..7531543c1abb 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/primaryPrivateConstructor.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/primaryPrivateConstructor.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 package demo;
 
 enum Color {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/privateEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/privateEnum.java
index 36e98f9a9a16..963b14059d82 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/privateEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/privateEnum.java
@@ -1,2 +1 @@
-//class
 private enum Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/protectedEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/protectedEnum.java
index 838da5ff5721..1361563477c2 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/protectedEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/protectedEnum.java
@@ -1,2 +1 @@
-//class
 protected enum Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/publicEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/publicEnum.java
index 684a2e18b7cf..23365fc38535 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/publicEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/publicEnum.java
@@ -1,2 +1 @@
-//class
 public enum Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/runnableImplementation.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/runnableImplementation.java
index bb5588035d7e..e14ffe53001d 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/runnableImplementation.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/runnableImplementation.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 enum Color implements Runnable {
   WHITE, BLACK, RED, YELLOW, BLUE;
 
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/typeSafeEnum.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/typeSafeEnum.java
index 40c1b236bd45..1ecc70526e42 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/typeSafeEnum.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/enum/typeSafeEnum.java
@@ -1,2 +1 @@
-//class
 enum Coin { PENNY, NICKEL, DIME, QUARTER; }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/abstractInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/abstractInterface.java
index 53337871d075..17b898689432 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/abstractInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/abstractInterface.java
@@ -1,2 +1 @@
-//class
 abstract interface I {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/emptyInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/emptyInterface.java
index 9a74240790db..0bdb5912e9ba 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/emptyInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/emptyInterface.java
@@ -1,2 +1 @@
-//class
 interface A {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/extendsOneClassAndImplementsSeveralInterfaces.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/extendsOneClassAndImplementsSeveralInterfaces.java
index 2d1e6b2c3a83..94219d275c16 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/extendsOneClassAndImplementsSeveralInterfaces.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/extendsOneClassAndImplementsSeveralInterfaces.java
@@ -1,4 +1,3 @@
-//class
 interface I0 {}
 interface I1 {}
 interface I2 {}
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithFields.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithFields.java
index b17b085a0e15..e345745c0566 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithFields.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithFields.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = IN + AT;}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithMethodDeclaration.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithMethodDeclaration.java
index 827342436e7c..a6b7205cb138 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithMethodDeclaration.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithMethodDeclaration.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 interface INode {Tag getTag();String toKotlin();}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithStaticFields.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithStaticFields.java
index 3c62f61778dd..f621bac1cb9d 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithStaticFields.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/interfaceWithStaticFields.java
@@ -1,3 +1,2 @@
 // IGNORE_K2
-//class
 public interface INode {  public static final String IN = "in";  public static final String AT = "@";  public static final String COMMA_WITH_SPACE = IN + AT;}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/internalInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/internalInterface.java
index 475a1f50cade..6afccc2f1691 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/internalInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/internalInterface.java
@@ -1,2 +1 @@
-//class
 interface Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/privateInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/privateInterface.java
index 4da638e3aa2f..cf33d97c99cd 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/privateInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/privateInterface.java
@@ -1,2 +1 @@
-//class
 private interface Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/protectedInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/protectedInterface.java
index f6d52096fc36..e91d56940214 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/protectedInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/protectedInterface.java
@@ -1,2 +1 @@
-//class
 protected interface Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/publicInterface.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/publicInterface.java
index 3973e285389c..19c4ff3a675e 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/publicInterface.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/interface/publicInterface.java
@@ -1,2 +1 @@
-//class
 public interface Test {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParam.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParam.java
index 4fd73de1d27c..c86e5472816e 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParam.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParam.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 class Foo {
     Foo(int a, int b) {
     }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParams.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParams.java
index 4fd73de1d27c..c86e5472816e 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParams.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithParams.java
@@ -1,5 +1,4 @@
 // IGNORE_K2
-//class
 class Foo {
     Foo(int a, int b) {
     }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithoutBody.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithoutBody.java
index 13654b859a28..e91ff5685e06 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithoutBody.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/classWithoutBody.java
@@ -1,4 +1,3 @@
-//class
 class Foo {}
 class Bar {
     void bar() {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassExtending.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassExtending.java
index 1936ac38a00b..d23995b68a2d 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassExtending.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassExtending.java
@@ -1,2 +1 @@
-//class
 interface CommandHandler<T extends Command> {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassMultiplyExtending.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassMultiplyExtending.java
index 2b80ced7b308..8d1c87481fff 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassMultiplyExtending.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/complexExampleWithClassMultiplyExtending.java
@@ -1,2 +1 @@
-//class
 interface CommandHandler<T extends INode, String> {}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/genericClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/genericClass.java
index 251689718ad8..10066e3b55d8 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/genericClass.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/genericClass.java
@@ -1,2 +1 @@
-//class
 final class Comparable<T> {}
\ No newline at end of file