From cd033a65863cbb309a2d7d402cc6db97ecde958e Mon Sep 17 00:00:00 2001
From: Alexey Belkov <alexey.belkov@jetbrains.com>
Date: Sat, 23 Mar 2024 20:12:43 +0400
Subject: [PATCH] [kotlin] J2K: cleanup testdata

Remove unnecessary errors.

GitOrigin-RevId: 30a0f7a00344bac233e438baf4b74d275d5cfde8
---
 .../NewJavaToKotlinConverterSingleFileTestGenerated.java  | 5 -----
 .../K2JavaToKotlinConverterSingleFileTestGenerated.java   | 5 -----
 .../shared/tests/testData/newJ2k/field/internalField.java | 3 +--
 .../shared/tests/testData/newJ2k/field/internalField.kt   | 3 +--
 .../shared/tests/testData/newJ2k/field/privateField.java  | 3 +--
 .../shared/tests/testData/newJ2k/field/privateField.kt    | 3 +--
 .../tests/testData/newJ2k/field/protectedField.java       | 3 +--
 .../shared/tests/testData/newJ2k/field/protectedField.kt  | 3 +--
 .../shared/tests/testData/newJ2k/field/publicField.java   | 3 +--
 .../j2k/shared/tests/testData/newJ2k/field/publicField.kt | 3 +--
 .../tests/testData/newJ2k/field/varWithoutInit.java       | 4 ----
 .../shared/tests/testData/newJ2k/field/varWithoutInit.kt  | 4 ----
 .../testData/newJ2k/importStatement/onlyImports.java      | 3 +--
 .../tests/testData/newJ2k/importStatement/onlyImports.kt  | 2 --
 .../j2k/shared/tests/testData/newJ2k/list/ForEach.java    | 2 +-
 .../j2k/shared/tests/testData/newJ2k/list/ForEach.kt      | 5 +++--
 .../j2k/shared/tests/testData/newJ2k/list/Lists.java      | 2 +-
 .../kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.kt | 5 +++--
 .../newJ2k/nullability/FieldComparedWithNull.java         | 7 +++++--
 .../testData/newJ2k/nullability/FieldComparedWithNull.kt  | 7 +++++--
 .../nullability/MethodResultInitializesNullableField.java | 8 +++++---
 .../nullability/MethodResultInitializesNullableField.kt   | 7 +++----
 .../testData/newJ2k/tryStatement/disjunctionType.java     | 6 +++++-
 .../tests/testData/newJ2k/tryStatement/disjunctionType.kt | 6 +++++-
 .../testData/partialConverter/field/internalField.java    | 3 +--
 .../testData/partialConverter/field/internalField.kt      | 5 ++---
 .../testData/partialConverter/field/privateField.java     | 3 +--
 .../tests/testData/partialConverter/field/privateField.kt | 3 +--
 .../testData/partialConverter/field/protectedField.java   | 3 +--
 .../testData/partialConverter/field/protectedField.kt     | 5 ++---
 .../testData/partialConverter/field/publicField.java      | 3 +--
 .../tests/testData/partialConverter/field/publicField.kt  | 5 ++---
 .../testData/partialConverter/field/varWithoutInit.java   | 2 +-
 .../testData/partialConverter/field/varWithoutInit.kt     | 3 +--
 34 files changed, 58 insertions(+), 79 deletions(-)
 delete mode 100644 plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.java
 delete mode 100644 plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.kt

diff --git a/plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index a0117801399e..c81d30423d91 100644
--- a/plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -2312,11 +2312,6 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
             runTest("../../shared/tests/testData/newJ2k/field/varWithInit.java");
         }
 
-        @TestMetadata("varWithoutInit.java")
-        public void testVarWithoutInit() throws Exception {
-            runTest("../../shared/tests/testData/newJ2k/field/varWithoutInit.java");
-        }
-
         @TestMetadata("volatileCommon.java")
         public void testVolatileCommon() throws Exception {
             runTest("../../shared/tests/testData/newJ2k/field/volatileCommon.java");
diff --git a/plugins/kotlin/j2k/k2/tests/test/org/jetbrains/kotlin/j2k/k2/K2JavaToKotlinConverterSingleFileTestGenerated.java b/plugins/kotlin/j2k/k2/tests/test/org/jetbrains/kotlin/j2k/k2/K2JavaToKotlinConverterSingleFileTestGenerated.java
index f4d3a09bc7b5..5c3e790211b7 100644
--- a/plugins/kotlin/j2k/k2/tests/test/org/jetbrains/kotlin/j2k/k2/K2JavaToKotlinConverterSingleFileTestGenerated.java
+++ b/plugins/kotlin/j2k/k2/tests/test/org/jetbrains/kotlin/j2k/k2/K2JavaToKotlinConverterSingleFileTestGenerated.java
@@ -2312,11 +2312,6 @@ public abstract class K2JavaToKotlinConverterSingleFileTestGenerated extends Abs
             runTest("../../shared/tests/testData/newJ2k/field/varWithInit.java");
         }
 
-        @TestMetadata("varWithoutInit.java")
-        public void testVarWithoutInit() throws Exception {
-            runTest("../../shared/tests/testData/newJ2k/field/varWithoutInit.java");
-        }
-
         @TestMetadata("volatileCommon.java")
         public void testVolatileCommon() throws Exception {
             runTest("../../shared/tests/testData/newJ2k/field/volatileCommon.java");
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.java
index 2b942d8f278c..73c375b570ec 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-Foo f;
+    String f;
 }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.kt
index 4ef2d4439082..417e8724c25b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/internalField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    var f: Foo? = null
+    var f: String? = null
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.java
index 1cb372fc21e0..18889d22ad33 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-private Foo f;
+    private String f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.kt
index 0940da03b4c0..dc39985b7034 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/privateField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    private val f: Foo? = null
+    private val f: String? = null
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.java
index d5924f68a45b..5b1a558db093 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-protected Foo f;
+    protected String f;
 }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.kt
index 88f403a5cc2b..2ffcfe64fc8b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/protectedField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    protected var f: Foo? = null
+    protected var f: String? = null
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.java
index a006ed3650ff..a761ad7de586 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-public Foo f;
+    public String f;
 }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.kt
index 4ef2d4439082..417e8724c25b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/publicField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    var f: Foo? = null
+    var f: String? = null
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.java
deleted file mode 100644
index 2b942d8f278c..000000000000
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// IGNORE_K2
-class C {
-Foo f;
-}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.kt
deleted file mode 100644
index 4ef2d4439082..000000000000
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/field/varWithoutInit.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// ERROR: Unresolved reference: Foo
-internal class C {
-    var f: Foo? = null
-}
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.java
index dd82eb9ad7ee..8ceef39e0c4f 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.java
@@ -1,3 +1,2 @@
-// IGNORE_K2
 import java.util.Arrays;
-import java.util.concurrent.ArrayBlockingQueues;
+import java.util.concurrent.BlockingDeque;
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.kt
index 2d61058cc446..e69de29bb2d1 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/importStatement/onlyImports.kt
@@ -1,2 +0,0 @@
-// ERROR: Unresolved reference: ArrayBlockingQueues
-import java.util.concurrent.ArrayBlockingQueues
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.java
index cafba5363a91..13d3d0ea1046 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.java
@@ -4,7 +4,7 @@ import java.util.*;
 public class ForEach {
     public void test() {
         ArrayList<Object> xs = new ArrayList<Object>();
-        List<Object> ys = new ELinkedList<Object>();
+        List<Object> ys = new LinkedList<Object>();
         for (Object x : xs) {
             ys.add(x);
         }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.kt
index c77d1e5ce0c5..f4e971f42e6a 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/ForEach.kt
@@ -1,8 +1,9 @@
-// ERROR: Unresolved reference: ELinkedList
+import java.util.LinkedList
+
 class ForEach {
     fun test() {
         val xs = ArrayList<Any>()
-        val ys: MutableList<Any> = ELinkedList<Any>()
+        val ys: MutableList<Any> = LinkedList()
         for (x in xs) {
             ys.add(x)
         }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.java
index 0fd58bdee790..545a252bc7ea 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.java
@@ -4,7 +4,7 @@ import java.util.*;
 public class Lists {
     public void test() {
         List<Object> xs = new ArrayList<Object>();
-        List<Object> ys = new ELinkedList<Object>();
+        List<Object> ys = new LinkedList<Object>();
         ArrayList<Object> zs = new ArrayList<Object>();
         xs.add(null);
         ys.add(null);
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.kt
index 717d46a665f0..aa263a349c9b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/list/Lists.kt
@@ -1,8 +1,9 @@
-// ERROR: Unresolved reference: ELinkedList
+import java.util.LinkedList
+
 class Lists {
     fun test() {
         val xs: MutableList<Any?> = ArrayList()
-        val ys: MutableList<Any?> = ELinkedList<Any>()
+        val ys: MutableList<Any?> = LinkedList()
         val zs = ArrayList<Any?>()
         xs.add(null)
         ys.add(null)
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.java
index 9ed035fe23f2..d149844e2fa2 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.java
@@ -1,10 +1,13 @@
-// IGNORE_K2
 class C {
     private String s = x();
 
+    private String x() {
+        return null;
+    }
+
     void foo() {
         if (s == null) {
             System.out.print("null");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.kt
index 83baf9f61834..2d617cf8ff59 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/FieldComparedWithNull.kt
@@ -1,6 +1,9 @@
-// ERROR: Unresolved reference: x
 internal class C {
-    private val s: String? = x()
+    private val s = x()
+
+    private fun x(): String? {
+        return null
+    }
 
     fun foo() {
         if (s == null) {
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.java
index ec08e3982690..487a2869096c 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.java
@@ -1,8 +1,10 @@
-// IGNORE_K2
 import org.jetbrains.annotations.Nullable;
 
 class C {
-    @Nullable private final String string = getString();
+    @Nullable
+    final String string = getString();
 
-    static String getString() { return x(); }
+    static String getString() {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.kt
index e3735f2c6309..557f821129f1 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/MethodResultInitializesNullableField.kt
@@ -1,10 +1,9 @@
-// ERROR: Unresolved reference: x
 internal class C {
-    private val string: String? = getString()
+    val string: String? = getString()
 
     companion object {
-        fun getString(): String {
-            return x()
+        fun getString(): String? {
+            return null
         }
     }
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.java
index 243a88c67d46..a92213966d8f 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.java
@@ -4,10 +4,14 @@ import java.io.IOException;
 class A {
     void foo() {
         try {
-            bar()
+            bar();
         }
         catch(RuntimeException | IOException e) {
             e.printStackTrace(); // print stack trace
         }
     }
+
+    private void bar() throws IOException {
+        throw new IOException();
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.kt
index a67842174375..aa9be9bbc8e3 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/tryStatement/disjunctionType.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: bar
 import java.io.IOException
 
 internal class A {
@@ -11,4 +10,9 @@ internal class A {
             e.printStackTrace()
         }
     }
+
+    @Throws(IOException::class)
+    private fun bar() {
+        throw IOException()
+    }
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.java
index ed591d211e82..0e2e49a3fabb 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-Foo <caret>f;
+    String <caret>f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.kt
index b7573ab77704..417e8724c25b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/internalField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    var f: Foo? = null
-}
\ No newline at end of file
+    var f: String? = null
+}
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.java
index 90b9facd9e8a..036dc8e07bdc 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-private Foo <caret>f;
+    private String <caret>f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.kt
index 0940da03b4c0..dc39985b7034 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/privateField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    private val f: Foo? = null
+    private val f: String? = null
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.java
index 407a0489bc9a..2f51f3c3983f 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-protected Foo <caret>f;
+    protected String <caret>f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.kt
index b9558f109a44..2ffcfe64fc8b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/protectedField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    protected var f: Foo? = null
-}
\ No newline at end of file
+    protected var f: String? = null
+}
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.java
index cc82a0b2d8a6..bdb49cbe513c 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.java
@@ -1,4 +1,3 @@
-// IGNORE_K2
 class C {
-public Foo <caret>f;
+    public String <caret>f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.kt
index b7573ab77704..417e8724c25b 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/publicField.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    var f: Foo? = null
-}
\ No newline at end of file
+    var f: String? = null
+}
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.java
index 4dca0cedea3b..cbbc37e9d6f8 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.java
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.java
@@ -1,4 +1,4 @@
 // IGNORE_K2
 class <caret>C {
-Foo f;
+    String f;
 }
diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.kt
index ec6a35fc2eb5..7f5a18d74166 100644
--- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.kt
+++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/field/varWithoutInit.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: Foo
 internal class C {
-    var f: Foo = TODO()
+    var f: String = TODO()
 }