Regenerate tests

idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AndroidGutterIconTestGenerated.java

@@ -21,52 +21,106 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidGutterIconTestGenerated extends AbstractAndroidGutterIconTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInGutterIcon() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("color.kt")
     public void testColor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/color.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/color.kt");
     }
 
     @TestMetadata("drawable.kt")
     public void testDrawable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/drawable.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/drawable.kt");
     }
 
     @TestMetadata("mipmap.kt")
     public void testMipmap() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/mipmap.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/mipmap.kt");
     }
 
     @TestMetadata("relatedFiles.kt")
     public void testRelatedFiles() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/relatedFiles.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/relatedFiles.kt");
     }
 
     @TestMetadata("systemColor.kt")
     public void testSystemColor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/systemColor.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/systemColor.kt");
     }
 
     @TestMetadata("systemDrawable.kt")
     public void testSystemDrawable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/gutterIcon/systemDrawable.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/gutterIcon/systemDrawable.kt");
     }
 
     @TestMetadata("idea/testData/android/gutterIcon/res")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Res extends AbstractAndroidGutterIconTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRes() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
+
+        @TestMetadata("idea/testData/android/gutterIcon/res/drawable")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Drawable extends AbstractAndroidGutterIconTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInDrawable() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res/drawable"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
+        }
+
+        @TestMetadata("idea/testData/android/gutterIcon/res/layout")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Layout extends AbstractAndroidGutterIconTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInLayout() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res/layout"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
+        }
+
+        @TestMetadata("idea/testData/android/gutterIcon/res/mipmap-mdpi")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Mipmap_mdpi extends AbstractAndroidGutterIconTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMipmap_mdpi() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res/mipmap-mdpi"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
+        }
+
+        @TestMetadata("idea/testData/android/gutterIcon/res/values")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Values extends AbstractAndroidGutterIconTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInValues() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res/values"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
+        }
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/configure/ConfigureProjectTestGenerated.java

@@ -23,136 +23,124 @@ public class ConfigureProjectTestGenerated extends AbstractConfigureProjectTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Android_gradle extends AbstractConfigureProjectTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestAndroidGradle, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInAndroid_gradle() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("androidStudioDefault_before.gradle")
         public void testAndroidStudioDefault() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
         }
 
         @TestMetadata("androidStudioDefaultShapshot_before.gradle")
         public void testAndroidStudioDefaultShapshot() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
         }
 
         @TestMetadata("buildConfigs_before.gradle")
         public void testBuildConfigs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
         }
 
         @TestMetadata("emptyDependencyList_before.gradle")
         public void testEmptyDependencyList() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
         }
 
         @TestMetadata("emptyFile_before.gradle")
         public void testEmptyFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
         }
 
         @TestMetadata("helloWorld_before.gradle")
         public void testHelloWorld() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
         }
 
         @TestMetadata("libraryFile_before.gradle")
         public void testLibraryFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
         }
 
         @TestMetadata("missedApplyAndroidStatement_before.gradle")
         public void testMissedApplyAndroidStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
         }
 
         @TestMetadata("missedBuildscriptBlock_before.gradle")
         public void testMissedBuildscriptBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
         }
 
         @TestMetadata("missedRepositoriesInBuildscriptBlock_before.gradle")
         public void testMissedRepositoriesInBuildscriptBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
         }
 
         @TestMetadata("productFlavor_before.gradle")
         public void testProductFlavor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
         }
 
         @TestMetadata("idea/testData/configuration/android-gradle/gradleExamples")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class GradleExamples extends AbstractConfigureProjectTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestAndroidGradle, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInGradleExamples() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), TargetBackend.ANY, true);
             }
 
             @TestMetadata("gradleExample0_before.gradle")
             public void testGradleExample0() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
             }
 
             @TestMetadata("gradleExample18_before.gradle")
             public void testGradleExample18() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
             }
 
             @TestMetadata("gradleExample22_before.gradle")
             public void testGradleExample22() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
             }
 
             @TestMetadata("gradleExample44_before.gradle")
             public void testGradleExample44() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
             }
 
             @TestMetadata("gradleExample5_before.gradle")
             public void testGradleExample5() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
             }
 
             @TestMetadata("gradleExample50_before.gradle")
             public void testGradleExample50() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
             }
 
             @TestMetadata("gradleExample58_before.gradle")
             public void testGradleExample58() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
             }
 
             @TestMetadata("gradleExample65_before.gradle")
             public void testGradleExample65() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
             }
 
             @TestMetadata("gradleExample8_before.gradle")
             public void testGradleExample8() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
-                doTestAndroidGradle(fileName);
+                runTest("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
             }
         }
     }
@@ -161,20 +149,22 @@ public class ConfigureProjectTestGenerated extends AbstractConfigureProjectTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Android_gsk extends AbstractConfigureProjectTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestAndroidGradle, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInAndroid_gsk() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gsk"), Pattern.compile("(\\w+)_before\\.gradle.kts$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("emptyFile_before.gradle.kts")
         public void testEmptyFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gsk/emptyFile_before.gradle.kts");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gsk/emptyFile_before.gradle.kts");
         }
 
         @TestMetadata("helloWorld_before.gradle.kts")
         public void testHelloWorld() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gsk/helloWorld_before.gradle.kts");
-            doTestAndroidGradle(fileName);
+            runTest("idea/testData/configuration/android-gsk/helloWorld_before.gradle.kts");
         }
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/folding/AndroidResourceFoldingTestGenerated.java

@@ -21,25 +21,26 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidResourceFoldingTestGenerated extends AbstractAndroidResourceFoldingTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInFolding() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/folding"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("dimensions.kt")
     public void testDimensions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/folding/dimensions.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/folding/dimensions.kt");
     }
 
     @TestMetadata("getString.kt")
     public void testGetString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/folding/getString.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/folding/getString.kt");
     }
 
     @TestMetadata("plurals.kt")
     public void testPlurals() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/folding/plurals.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/folding/plurals.kt");
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/intention/AndroidIntentionTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInIntention() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/intention"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,10 +33,13 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AddActivityToManifest extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("abstract.kt")
         public void testAbstract() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/abstract.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/abstract.kt");
         }
 
         public void testAllFilesPresentInAddActivityToManifest() throws Exception {
@@ -41,56 +48,47 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
 
         @TestMetadata("alreadyExists.kt")
         public void testAlreadyExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/alreadyExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/alreadyExists.kt");
         }
 
         @TestMetadata("inner.kt")
         public void testInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/inner.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/inner.kt");
         }
 
         @TestMetadata("insideBody.kt")
         public void testInsideBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/insideBody.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/insideBody.kt");
         }
 
         @TestMetadata("local.kt")
         public void testLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/local.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/local.kt");
         }
 
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/nested.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/nested.kt");
         }
 
         @TestMetadata("notActivity.kt")
         public void testNotActivity() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/notActivity.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/notActivity.kt");
         }
 
         @TestMetadata("private.kt")
         public void testPrivate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/private.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/private.kt");
         }
 
         @TestMetadata("protected.kt")
         public void testProtected() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/protected.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/protected.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addActivityToManifest/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addActivityToManifest/simple.kt");
         }
     }
 
@@ -98,10 +96,13 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AddBroadcastReceiverToManifest extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("abstract.kt")
         public void testAbstract() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/abstract.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/abstract.kt");
         }
 
         public void testAllFilesPresentInAddBroadcastReceiverToManifest() throws Exception {
@@ -110,56 +111,47 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
 
         @TestMetadata("alreadyExists.kt")
         public void testAlreadyExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/alreadyExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/alreadyExists.kt");
         }
 
         @TestMetadata("inner.kt")
         public void testInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/inner.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/inner.kt");
         }
 
         @TestMetadata("insideBody.kt")
         public void testInsideBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/insideBody.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/insideBody.kt");
         }
 
         @TestMetadata("local.kt")
         public void testLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/local.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/local.kt");
         }
 
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/nested.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/nested.kt");
         }
 
         @TestMetadata("notReceiver.kt")
         public void testNotReceiver() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/notReceiver.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/notReceiver.kt");
         }
 
         @TestMetadata("private.kt")
         public void testPrivate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/private.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/private.kt");
         }
 
         @TestMetadata("protected.kt")
         public void testProtected() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/protected.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/protected.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addBroadcastReceiverToManifest/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addBroadcastReceiverToManifest/simple.kt");
         }
     }
 
@@ -167,10 +159,13 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AddServiceToManifest extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("abstract.kt")
         public void testAbstract() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/abstract.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/abstract.kt");
         }
 
         public void testAllFilesPresentInAddServiceToManifest() throws Exception {
@@ -179,56 +174,47 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
 
         @TestMetadata("alreadyExists.kt")
         public void testAlreadyExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/alreadyExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/alreadyExists.kt");
         }
 
         @TestMetadata("inner.kt")
         public void testInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/inner.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/inner.kt");
         }
 
         @TestMetadata("insideBody.kt")
         public void testInsideBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/insideBody.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/insideBody.kt");
         }
 
         @TestMetadata("local.kt")
         public void testLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/local.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/local.kt");
         }
 
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/nested.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/nested.kt");
         }
 
         @TestMetadata("notService.kt")
         public void testNotService() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/notService.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/notService.kt");
         }
 
         @TestMetadata("private.kt")
         public void testPrivate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/private.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/private.kt");
         }
 
         @TestMetadata("protected.kt")
         public void testProtected() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/protected.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/protected.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/addServiceToManifest/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/addServiceToManifest/simple.kt");
         }
     }
 
@@ -236,68 +222,62 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ImplementParcelable extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInImplementParcelable() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/intention/implementParcelable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("allNullableTypes.kt")
         public void testAllNullableTypes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/allNullableTypes.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/allNullableTypes.kt");
         }
 
         @TestMetadata("allTypes.kt")
         public void testAllTypes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/allTypes.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/allTypes.kt");
         }
 
         @TestMetadata("alreadyImplemented.kt")
         public void testAlreadyImplemented() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/alreadyImplemented.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/alreadyImplemented.kt");
         }
 
         @TestMetadata("constructorProperties.kt")
         public void testConstructorProperties() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/constructorProperties.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/constructorProperties.kt");
         }
 
         @TestMetadata("constructorPropertiesWithParameters.kt")
         public void testConstructorPropertiesWithParameters() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/constructorPropertiesWithParameters.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/constructorPropertiesWithParameters.kt");
         }
 
         @TestMetadata("missingConstructor.kt")
         public void testMissingConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/missingConstructor.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/missingConstructor.kt");
         }
 
         @TestMetadata("missingDescribeContents.kt")
         public void testMissingDescribeContents() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/missingDescribeContents.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/missingDescribeContents.kt");
         }
 
         @TestMetadata("missingWriteToParcel.kt")
         public void testMissingWriteToParcel() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/missingWriteToParcel.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/missingWriteToParcel.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/simple.kt");
         }
 
         @TestMetadata("withTransient.kt")
         public void testWithTransient() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/implementParcelable/withTransient.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/implementParcelable/withTransient.kt");
         }
     }
 
@@ -305,56 +285,52 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RedoParcelable extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRedoParcelable() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/intention/redoParcelable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("indirectParcelable.kt")
         public void testIndirectParcelable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/indirectParcelable.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/indirectParcelable.kt");
         }
 
         @TestMetadata("init.kt")
         public void testInit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/init.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/init.kt");
         }
 
         @TestMetadata("initWithExtraStatements.kt")
         public void testInitWithExtraStatements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/initWithExtraStatements.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/initWithExtraStatements.kt");
         }
 
         @TestMetadata("noParcelable.kt")
         public void testNoParcelable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/noParcelable.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/noParcelable.kt");
         }
 
         @TestMetadata("oldField.kt")
         public void testOldField() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/oldField.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/oldField.kt");
         }
 
         @TestMetadata("oldFieldSecondary.kt")
         public void testOldFieldSecondary() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/oldFieldSecondary.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/oldFieldSecondary.kt");
         }
 
         @TestMetadata("parcelize.kt")
         public void testParcelize() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/parcelize.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/parcelize.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/redoParcelable/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/redoParcelable/simple.kt");
         }
     }
 
@@ -362,44 +338,42 @@ public class AndroidIntentionTestGenerated extends AbstractAndroidIntentionTest
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveParcelable extends AbstractAndroidIntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRemoveParcelable() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/intention/removeParcelable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("inderectParcelable.kt")
         public void testInderectParcelable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/inderectParcelable.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/inderectParcelable.kt");
         }
 
         @TestMetadata("init.kt")
         public void testInit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/init.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/init.kt");
         }
 
         @TestMetadata("initWithExtraStatements.kt")
         public void testInitWithExtraStatements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/initWithExtraStatements.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/initWithExtraStatements.kt");
         }
 
         @TestMetadata("noParcelable.kt")
         public void testNoParcelable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/noParcelable.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/noParcelable.kt");
         }
 
         @TestMetadata("parcelize.kt")
         public void testParcelize() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/parcelize.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/parcelize.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/intention/removeParcelable/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/intention/removeParcelable/simple.kt");
         }
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/intention/AndroidResourceIntentionTestGenerated.java

@@ -21,127 +21,111 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidResourceIntentionTestGenerated extends AbstractAndroidResourceIntentionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInResourceIntention() throws Exception {
         KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/android/resourceIntention"), Pattern.compile("^(.+)\\.test$"), TargetBackend.ANY);
     }
 
     @TestMetadata("createColorValueResource/alreadyExists/alreadyExists.test")
     public void testCreateColorValueResource_alreadyExists_AlreadyExists() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createColorValueResource/alreadyExists/alreadyExists.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createColorValueResource/alreadyExists/alreadyExists.test");
     }
 
     @TestMetadata("createColorValueResource/simpleFunction/simpleFunction.test")
     public void testCreateColorValueResource_simpleFunction_SimpleFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/simpleFunction.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/simpleFunction.test");
     }
 
     @TestMetadata("createLayoutResourceFile/alreadyExists/alreadyExists.test")
     public void testCreateLayoutResourceFile_alreadyExists_AlreadyExists() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/alreadyExists.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/alreadyExists.test");
     }
 
     @TestMetadata("createLayoutResourceFile/simpleFunction/simpleFunction.test")
     public void testCreateLayoutResourceFile_simpleFunction_SimpleFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/simpleFunction.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/simpleFunction.test");
     }
 
     @TestMetadata("createStringValueResource/alreadyExists/alreadyExists.test")
     public void testCreateStringValueResource_alreadyExists_AlreadyExists() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createStringValueResource/alreadyExists/alreadyExists.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createStringValueResource/alreadyExists/alreadyExists.test");
     }
 
     @TestMetadata("createStringValueResource/simpleFunction/simpleFunction.test")
     public void testCreateStringValueResource_simpleFunction_SimpleFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/simpleFunction.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/simpleFunction.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/activityExtension/activityExtension.test")
     public void testKotlinAndroidAddStringResource_activityExtension_ActivityExtension() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/activityMethod/activityMethod.test")
     public void testKotlinAndroidAddStringResource_activityMethod_ActivityMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/classInActivity/classInActivity.test")
     public void testKotlinAndroidAddStringResource_classInActivity_ClassInActivity() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test")
     public void testKotlinAndroidAddStringResource_extensionLambda_ExtensionLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/function/function.test")
     public void testKotlinAndroidAddStringResource_function_Function() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test")
     public void testKotlinAndroidAddStringResource_genericContextExtensionFunction_GenericContextExtensionFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test")
     public void testKotlinAndroidAddStringResource_innerClassInActivity_InnerClassInActivity() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test")
     public void testKotlinAndroidAddStringResource_innerViewInActivity_InnerViewInActivity() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test")
     public void testKotlinAndroidAddStringResource_objectInActivity_ObjectInActivity() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test")
     public void testKotlinAndroidAddStringResource_objectInActivityMethod_ObjectInActivityMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test")
     public void testKotlinAndroidAddStringResource_objectInFunction_ObjectInFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test")
     public void testKotlinAndroidAddStringResource_stringTemplate_StringTemplate() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test")
     public void testKotlinAndroidAddStringResource_viewExtensionActivityMethod_ViewExtensionActivityMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test");
     }
 
     @TestMetadata("kotlinAndroidAddStringResource/viewMethod/viewMethod.test")
     public void testKotlinAndroidAddStringResource_viewMethod_ViewMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test");
-        doTest(fileName);
+        runTest("idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test");
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/lint/KotlinLintTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinLintTestGenerated extends AbstractKotlinLintTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("alarm.kt")
     public void testAlarm() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/alarm.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/alarm.kt");
     }
 
     public void testAllFilesPresentInLint() throws Exception {
@@ -33,163 +36,136 @@ public class KotlinLintTestGenerated extends AbstractKotlinLintTest {
 
     @TestMetadata("apiCheck.kt")
     public void testApiCheck() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/apiCheck.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/apiCheck.kt");
     }
 
     @TestMetadata("callSuper.kt")
     public void testCallSuper() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/callSuper.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/callSuper.kt");
     }
 
     @TestMetadata("closeCursor.kt")
     public void testCloseCursor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/closeCursor.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/closeCursor.kt");
     }
 
     @TestMetadata("commitFragment.kt")
     public void testCommitFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/commitFragment.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/commitFragment.kt");
     }
 
     @TestMetadata("findViewById.kt")
     public void testFindViewById() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/findViewById.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/findViewById.kt");
     }
 
     @TestMetadata("javaPerformance.kt")
     public void testJavaPerformance() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/javaPerformance.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/javaPerformance.kt");
     }
 
     @TestMetadata("javaScriptInterface.kt")
     public void testJavaScriptInterface() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/javaScriptInterface.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/javaScriptInterface.kt");
     }
 
     @TestMetadata("layoutInflation.kt")
     public void testLayoutInflation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/layoutInflation.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/layoutInflation.kt");
     }
 
     @TestMetadata("log.kt")
     public void testLog() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/log.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/log.kt");
     }
 
     @TestMetadata("noInternationalSms.kt")
     public void testNoInternationalSms() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/noInternationalSms.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/noInternationalSms.kt");
     }
 
     @TestMetadata("overrideConcrete.kt")
     public void testOverrideConcrete() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/overrideConcrete.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/overrideConcrete.kt");
     }
 
     @TestMetadata("parcel.kt")
     public void testParcel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/parcel.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/parcel.kt");
     }
 
     @TestMetadata("sdCardTest.kt")
     public void testSdCardTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/sdCardTest.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/sdCardTest.kt");
     }
 
     @TestMetadata("setJavaScriptEnabled.kt")
     public void testSetJavaScriptEnabled() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/setJavaScriptEnabled.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/setJavaScriptEnabled.kt");
     }
 
     @TestMetadata("sharedPrefs.kt")
     public void testSharedPrefs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/sharedPrefs.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/sharedPrefs.kt");
     }
 
     @TestMetadata("showDiagnosticsWhenFileIsRed.kt")
     public void testShowDiagnosticsWhenFileIsRed() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/showDiagnosticsWhenFileIsRed.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/showDiagnosticsWhenFileIsRed.kt");
     }
 
     @TestMetadata("sqlite.kt")
     public void testSqlite() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/sqlite.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/sqlite.kt");
     }
 
     @TestMetadata("supportAnnotation.kt")
     public void testSupportAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/supportAnnotation.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/supportAnnotation.kt");
     }
 
     @TestMetadata("systemServices.kt")
     public void testSystemServices() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/systemServices.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/systemServices.kt");
     }
 
     @TestMetadata("toast.kt")
     public void testToast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/toast.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/toast.kt");
     }
 
     @TestMetadata("valueOf.kt")
     public void testValueOf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/valueOf.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/valueOf.kt");
     }
 
     @TestMetadata("velocityTrackerRecycle.kt")
     public void testVelocityTrackerRecycle() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/velocityTrackerRecycle.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/velocityTrackerRecycle.kt");
     }
 
     @TestMetadata("viewConstructor.kt")
     public void testViewConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/viewConstructor.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/viewConstructor.kt");
     }
 
     @TestMetadata("viewHolder.kt")
     public void testViewHolder() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/viewHolder.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/viewHolder.kt");
     }
 
     @TestMetadata("wrongAnnotation.kt")
     public void testWrongAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/wrongAnnotation.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/wrongAnnotation.kt");
     }
 
     @TestMetadata("wrongImport.kt")
     public void testWrongImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/wrongImport.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/wrongImport.kt");
     }
 
     @TestMetadata("wrongViewCall.kt")
     public void testWrongViewCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lint/wrongViewCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/android/lint/wrongViewCall.kt");
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AndroidLintQuickfixTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfixTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLintQuickfix() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,20 +33,22 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FindViewById extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInFindViewById() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix/findViewById"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("nullableType.kt")
         public void testNullableType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/findViewById/nullableType.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/findViewById/nullableType.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/findViewById/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/findViewById/simple.kt");
         }
     }
 
@@ -50,20 +56,22 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Parcelable extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInParcelable() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix/parcelable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("missingCreator.kt")
         public void testMissingCreator() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/parcelable/missingCreator.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/parcelable/missingCreator.kt");
         }
 
         @TestMetadata("noImplementation.kt")
         public void testNoImplementation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/parcelable/noImplementation.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/parcelable/noImplementation.kt");
         }
     }
 
@@ -71,68 +79,62 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RequiresApi extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRequiresApi() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix/requiresApi"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("annotation.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/annotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/annotation.kt");
         }
 
         @TestMetadata("companion.kt")
         public void testCompanion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/companion.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/companion.kt");
         }
 
         @TestMetadata("defaultParameter.kt")
         public void testDefaultParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/defaultParameter.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/defaultParameter.kt");
         }
 
         @TestMetadata("extend.kt")
         public void testExtend() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/extend.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/extend.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/functionLiteral.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/functionLiteral.kt");
         }
 
         @TestMetadata("inlinedConstant.kt")
         public void testInlinedConstant() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/inlinedConstant.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/inlinedConstant.kt");
         }
 
         @TestMetadata("method.kt")
         public void testMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/method.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/method.kt");
         }
 
         @TestMetadata("property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/property.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/property.kt");
         }
 
         @TestMetadata("topLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/topLevelProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/topLevelProperty.kt");
         }
 
         @TestMetadata("when.kt")
         public void testWhen() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/requiresApi/when.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/requiresApi/when.kt");
         }
     }
 
@@ -140,16 +142,18 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SuppressLint extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("activityMethod.kt")
         public void testActivityMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/activityMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/activityMethod.kt");
         }
 
         @TestMetadata("addToExistingAnnotation.kt")
         public void testAddToExistingAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt");
         }
 
         public void testAllFilesPresentInSuppressLint() throws Exception {
@@ -158,44 +162,37 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
 
         @TestMetadata("constructorParameter.kt")
         public void testConstructorParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/constructorParameter.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/constructorParameter.kt");
         }
 
         @TestMetadata("destructuringDeclaration.kt")
         public void testDestructuringDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt");
         }
 
         @TestMetadata("lambdaArgument.kt")
         public void testLambdaArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt");
         }
 
         @TestMetadata("lambdaArgumentProperty.kt")
         public void testLambdaArgumentProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt");
         }
 
         @TestMetadata("methodParameter.kt")
         public void testMethodParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/methodParameter.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/methodParameter.kt");
         }
 
         @TestMetadata("propertyWithLambda.kt")
         public void testPropertyWithLambda() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt");
         }
 
         @TestMetadata("simpleProperty.kt")
         public void testSimpleProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/suppressLint/simpleProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/suppressLint/simpleProperty.kt");
         }
     }
 
@@ -203,68 +200,62 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TargetApi extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTargetApi() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix/targetApi"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("annotation.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/annotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/annotation.kt");
         }
 
         @TestMetadata("companion.kt")
         public void testCompanion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/companion.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/companion.kt");
         }
 
         @TestMetadata("defaultParameter.kt")
         public void testDefaultParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/defaultParameter.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/defaultParameter.kt");
         }
 
         @TestMetadata("extend.kt")
         public void testExtend() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/extend.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/extend.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/functionLiteral.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/functionLiteral.kt");
         }
 
         @TestMetadata("inlinedConstant.kt")
         public void testInlinedConstant() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/inlinedConstant.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/inlinedConstant.kt");
         }
 
         @TestMetadata("method.kt")
         public void testMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/method.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/method.kt");
         }
 
         @TestMetadata("property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/property.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/property.kt");
         }
 
         @TestMetadata("topLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/topLevelProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/topLevelProperty.kt");
         }
 
         @TestMetadata("when.kt")
         public void testWhen() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetApi/when.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetApi/when.kt");
         }
     }
 
@@ -272,74 +263,67 @@ public class AndroidLintQuickfixTestGenerated extends AbstractAndroidLintQuickfi
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TargetVersionCheck extends AbstractAndroidLintQuickfixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTargetVersionCheck() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/lintQuickfix/targetVersionCheck"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("annotation.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/annotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/annotation.kt");
         }
 
         @TestMetadata("defaultParameter.kt")
         public void testDefaultParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt");
         }
 
         @TestMetadata("destructuringDeclaration.kt")
         public void testDestructuringDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/destructuringDeclaration.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/destructuringDeclaration.kt");
         }
 
         @TestMetadata("expressionBody.kt")
         public void testExpressionBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt");
         }
 
         @TestMetadata("getterWIthExpressionBody.kt")
         public void testGetterWIthExpressionBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/getterWIthExpressionBody.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/getterWIthExpressionBody.kt");
         }
 
         @TestMetadata("if.kt")
         public void testIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/if.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/if.kt");
         }
 
         @TestMetadata("ifWithBlock.kt")
         public void testIfWithBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt");
         }
 
         @TestMetadata("inlinedConstant.kt")
         public void testInlinedConstant() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/inlinedConstant.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/inlinedConstant.kt");
         }
 
         @TestMetadata("method.kt")
         public void testMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/method.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/method.kt");
         }
 
         @TestMetadata("when.kt")
         public void testWhen() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/lintQuickfix/targetVersionCheck/when.kt");
-            doTest(fileName);
+            runTest("idea/testData/android/lintQuickfix/targetVersionCheck/when.kt");
         }
     }
 }

idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AndroidQuickFixMultiFileTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidQuickFixMultiFileTestGenerated extends AbstractAndroidQuickFixMultiFileTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTestWithExtraFile, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInQuickfix() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/quickfix"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true);
     }
@@ -29,14 +33,17 @@ public class AndroidQuickFixMultiFileTestGenerated extends AbstractAndroidQuickF
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AutoImports extends AbstractAndroidQuickFixMultiFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithExtraFile, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInAutoImports() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("androidRImport.before.Main.kt")
         public void testAndroidRImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/quickfix/autoImports/androidRImport.before.Main.kt");
-            doTestWithExtraFile(fileName);
+            runTest("idea/testData/android/quickfix/autoImports/androidRImport.before.Main.kt");
         }
     }
 
@@ -44,20 +51,22 @@ public class AndroidQuickFixMultiFileTestGenerated extends AbstractAndroidQuickF
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ViewConstructor extends AbstractAndroidQuickFixMultiFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithExtraFile, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInViewConstructor() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/quickfix/viewConstructor"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("indirect.before.Main.kt")
         public void testIndirect() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/quickfix/viewConstructor/indirect.before.Main.kt");
-            doTestWithExtraFile(fileName);
+            runTest("idea/testData/android/quickfix/viewConstructor/indirect.before.Main.kt");
         }
 
         @TestMetadata("simple.before.Main.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/android/quickfix/viewConstructor/simple.before.Main.kt");
-            doTestWithExtraFile(fileName);
+            runTest("idea/testData/android/quickfix/viewConstructor/simple.before.Main.kt");
         }
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java

@@ -21,181 +21,156 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInInjava() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("AnnotationParameter.java")
     public void testAnnotationParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/AnnotationParameter.java");
     }
 
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Class.java");
     }
 
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassMembers.java");
     }
 
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassObject.java");
     }
 
     @TestMetadata("ClassObjectField.java")
     public void testClassObjectField() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassObjectField.java");
     }
 
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
     }
 
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/EnumConstants.java");
     }
 
     @TestMetadata("InterfaceDefaultImpl.java")
     public void testInterfaceDefaultImpl() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
     }
 
     @TestMetadata("InterfaceDefaultImplImportedMembers.java")
     public void testInterfaceDefaultImplImportedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplMembers.java")
     public void testInterfaceDefaultImplMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java")
     public void testInterfaceDefaultImplStaticImportedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplsNonImported.java")
     public void testInterfaceDefaultImplsNonImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java");
     }
 
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacade.java");
     }
 
     @TestMetadata("MultiFileFacadeMembers.java")
     public void testMultiFileFacadeMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
     }
 
     @TestMetadata("MultiFileFacadeNoImport.java")
     public void testMultiFileFacadeNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
     }
 
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Nested.java");
     }
 
     @TestMetadata("NestedClassMembers.java")
     public void testNestedClassMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedClassMembers.java");
     }
 
     @TestMetadata("NestedClassMembers2.java")
     public void testNestedClassMembers2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedClassMembers2.java");
     }
 
     @TestMetadata("NestedNoImport.java")
     public void testNestedNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedNoImport.java");
     }
 
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedObjectInstance.java");
     }
 
     @TestMetadata("ObjectInClassObjects.java")
     public void testObjectInClassObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
     }
 
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ObjectInstance.java");
     }
 
     @TestMetadata("RenamedFacade.java")
     public void testRenamedFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/RenamedFacade.java");
     }
 
     @TestMetadata("SingleFileFacade.java")
     public void testSingleFileFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacade.java");
     }
 
     @TestMetadata("SingleFileFacadeMembers.java")
     public void testSingleFileFacadeMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
     }
 
     @TestMetadata("SingleFileFacadeNoImport.java")
     public void testSingleFileFacadeNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
     }
 
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Subpackage.java");
     }
 
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/TopLevelMembers.java");
     }
 
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/TraitMember.java");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionIncrementalResolveTestGenerated.java

@@ -21,67 +21,61 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompletionIncrementalResolveTestGenerated extends AbstractCompletionIncrementalResolveTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInIncrementalResolve() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/incrementalResolve"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("codeAboveChanged.kt")
     public void testCodeAboveChanged() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/codeAboveChanged.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/codeAboveChanged.kt");
     }
 
     @TestMetadata("codeAboveChanged2.kt")
     public void testCodeAboveChanged2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/codeAboveChanged2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/codeAboveChanged2.kt");
     }
 
     @TestMetadata("dataFlowInfoFromPrevStatement.kt")
     public void testDataFlowInfoFromPrevStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/dataFlowInfoFromPrevStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/dataFlowInfoFromPrevStatement.kt");
     }
 
     @TestMetadata("dataFlowInfoFromSameStatement.kt")
     public void testDataFlowInfoFromSameStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/dataFlowInfoFromSameStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/dataFlowInfoFromSameStatement.kt");
     }
 
     @TestMetadata("doNotAnalyzeComplexStatement.kt")
     public void testDoNotAnalyzeComplexStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/doNotAnalyzeComplexStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/doNotAnalyzeComplexStatement.kt");
     }
 
     @TestMetadata("noDataFlowFromOldStatement.kt")
     public void testNoDataFlowFromOldStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/noDataFlowFromOldStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/noDataFlowFromOldStatement.kt");
     }
 
     @TestMetadata("noPrevStatement.kt")
     public void testNoPrevStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/noPrevStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/noPrevStatement.kt");
     }
 
     @TestMetadata("outOfBlockModification.kt")
     public void testOutOfBlockModification() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/outOfBlockModification.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/outOfBlockModification.kt");
     }
 
     @TestMetadata("prevStatementNotResolved.kt")
     public void testPrevStatementNotResolved() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/prevStatementNotResolved.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/prevStatementNotResolved.kt");
     }
 
     @TestMetadata("sameStatement.kt")
     public void testSameStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/incrementalResolve/sameStatement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/incrementalResolve/sameStatement.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/Java8BasicCompletionTestGenerated.java

@@ -21,19 +21,21 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class Java8BasicCompletionTestGenerated extends AbstractJava8BasicCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInJava8() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java8"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("CollectionMethods.kt")
     public void testCollectionMethods() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java8/CollectionMethods.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/java8/CollectionMethods.kt");
     }
 
     @TestMetadata("StreamMethods.kt")
     public void testStreamMethods() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java8/StreamMethods.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/java8/StreamMethods.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java

@@ -21,55 +21,51 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInWithLib() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("NamedArgumentsJava.kt")
     public void testNamedArgumentsJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt");
     }
 
     @TestMetadata("NamedArgumentsKotlin.kt")
     public void testNamedArgumentsKotlin() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt");
     }
 
     @TestMetadata("SamAdapter.kt")
     public void testSamAdapter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/SamAdapter.kt");
     }
 
     @TestMetadata("SamAdapterAndGenerics.kt")
     public void testSamAdapterAndGenerics() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt");
     }
 
     @TestMetadata("TopLevelNonImportedExtFun.kt")
     public void testTopLevelNonImportedExtFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt");
     }
 
     @TestMetadata("TopLevelNonImportedExtProp.kt")
     public void testTopLevelNonImportedExtProp() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt");
     }
 
     @TestMetadata("TopLevelNonImportedFun.kt")
     public void testTopLevelNonImportedFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt");
     }
 
     @TestMetadata("TopLevelNonImportedProperty.kt")
     public void testTopLevelNonImportedProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KDocCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("AfterPackageName.kt")
     public void testAfterPackageName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/AfterPackageName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/AfterPackageName.kt");
     }
 
     public void testAllFilesPresentInKdoc() throws Exception {
@@ -33,121 +36,101 @@ public class KDocCompletionTestGenerated extends AbstractJvmBasicCompletionTest
 
     @TestMetadata("ExtensionsFQLink.kt")
     public void testExtensionsFQLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ExtensionsFQLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/ExtensionsFQLink.kt");
     }
 
     @TestMetadata("ExtensionsForNestedClassFQLink.kt")
     public void testExtensionsForNestedClassFQLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ExtensionsForNestedClassFQLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/ExtensionsForNestedClassFQLink.kt");
     }
 
     @TestMetadata("FQLink.kt")
     public void testFQLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/FQLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/FQLink.kt");
     }
 
     @TestMetadata("FQLinkInTag1.kt")
     public void testFQLinkInTag1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/FQLinkInTag1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/FQLinkInTag1.kt");
     }
 
     @TestMetadata("FQLinkInTag2.kt")
     public void testFQLinkInTag2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/FQLinkInTag2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/FQLinkInTag2.kt");
     }
 
     @TestMetadata("Link.kt")
     public void testLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/Link.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/Link.kt");
     }
 
     @TestMetadata("MemberEnumEntryFQLink.kt")
     public void testMemberEnumEntryFQLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberEnumEntryFQLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/MemberEnumEntryFQLink.kt");
     }
 
     @TestMetadata("MemberEnumEntryLink.kt")
     public void testMemberEnumEntryLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberEnumEntryLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/MemberEnumEntryLink.kt");
     }
 
     @TestMetadata("MemberLink.kt")
     public void testMemberLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberLink.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/MemberLink.kt");
     }
 
     @TestMetadata("NoCompletionAfterFunName.kt")
     public void testNoCompletionAfterFunName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NoCompletionAfterFunName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/NoCompletionAfterFunName.kt");
     }
 
     @TestMetadata("NoTopLevelForQualified.kt")
     public void testNoTopLevelForQualified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NoTopLevelForQualified.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/NoTopLevelForQualified.kt");
     }
 
     @TestMetadata("NotTagName.kt")
     public void testNotTagName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/NotTagName.kt");
     }
 
     @TestMetadata("ParamTag.kt")
     public void testParamTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/ParamTag.kt");
     }
 
     @TestMetadata("SkipExistingParamTag.kt")
     public void testSkipExistingParamTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt");
     }
 
     @TestMetadata("TagName.kt")
     public void testTagName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagName.kt");
     }
 
     @TestMetadata("TagNameAfterAt.kt")
     public void testTagNameAfterAt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt");
     }
 
     @TestMetadata("TagNameInClass.kt")
     public void testTagNameInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameInClass.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagNameInClass.kt");
     }
 
     @TestMetadata("TagNameInExtensionFunction.kt")
     public void testTagNameInExtensionFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameInExtensionFunction.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagNameInExtensionFunction.kt");
     }
 
     @TestMetadata("TagNameMiddle.kt")
     public void testTagNameMiddle() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameMiddle.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagNameMiddle.kt");
     }
 
     @TestMetadata("TagNameStart.kt")
     public void testTagNameStart() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameStart.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/kdoc/TagNameStart.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java

@@ -21,82 +21,73 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("AfterClassProperty.kt")
     public void testAfterClassProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClassProperty.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterClassProperty.kt");
     }
 
     @TestMetadata("AfterClasses.kt")
     public void testAfterClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterClasses.kt");
     }
 
     @TestMetadata("AfterClasses_LangLevel10.kt")
     public void testAfterClasses_LangLevel10() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt");
     }
 
     @TestMetadata("AfterClasses_LangLevel11.kt")
     public void testAfterClasses_LangLevel11() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt");
     }
 
     @TestMetadata("AfterDot.kt")
     public void testAfterDot() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterDot.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterDot.kt");
     }
 
     @TestMetadata("AfterFuns.kt")
     public void testAfterFuns() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterFuns.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterFuns.kt");
     }
 
     @TestMetadata("AfterIf.kt")
     public void testAfterIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterIf.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterIf.kt");
     }
 
     @TestMetadata("AfterSafeDot.kt")
     public void testAfterSafeDot() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSafeDot.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterSafeDot.kt");
     }
 
     @TestMetadata("AfterSpaceAndDot.kt")
     public void testAfterSpaceAndDot() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt");
     }
 
     @TestMetadata("AfterTry.kt")
     public void testAfterTry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterTry.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterTry.kt");
     }
 
     @TestMetadata("AfterTryCatch.kt")
     public void testAfterTryCatch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterTryCatch.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterTryCatch.kt");
     }
 
     @TestMetadata("AfterTryFinally.kt")
     public void testAfterTryFinally() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterTryFinally.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterTryFinally.kt");
     }
 
     @TestMetadata("AfterTryInAssignment.kt")
     public void testAfterTryInAssignment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterTryInAssignment.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/AfterTryInAssignment.kt");
     }
 
     public void testAllFilesPresentInKeywords() throws Exception {
@@ -105,517 +96,431 @@ public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTes
 
     @TestMetadata("BeforeClass.kt")
     public void testBeforeClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeClass.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/BeforeClass.kt");
     }
 
     @TestMetadata("BeforeDelegationCall.kt")
     public void testBeforeDelegationCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt");
     }
 
     @TestMetadata("BreakContinue.kt")
     public void testBreakContinue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakContinue.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/BreakContinue.kt");
     }
 
     @TestMetadata("BreakWithLabel.kt")
     public void testBreakWithLabel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakWithLabel.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/BreakWithLabel.kt");
     }
 
     @TestMetadata("CommaExpected.kt")
     public void testCommaExpected() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CommaExpected.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/CommaExpected.kt");
     }
 
     @TestMetadata("CompanionObjectBeforeObject.kt")
     public void testCompanionObjectBeforeObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt");
     }
 
     @TestMetadata("ContinueWithLabel.kt")
     public void testContinueWithLabel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ContinueWithLabel.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ContinueWithLabel.kt");
     }
 
     @TestMetadata("Else1.kt")
     public void testElse1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Else1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Else1.kt");
     }
 
     @TestMetadata("Else2.kt")
     public void testElse2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Else2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Else2.kt");
     }
 
     @TestMetadata("FileKeyword.kt")
     public void testFileKeyword() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/FileKeyword.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/FileKeyword.kt");
     }
 
     @TestMetadata("GlobalPropertyAccessors.kt")
     public void testGlobalPropertyAccessors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt");
     }
 
     @TestMetadata("IfTry.kt")
     public void testIfTry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/IfTry.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/IfTry.kt");
     }
 
     @TestMetadata("IfTryCatch.kt")
     public void testIfTryCatch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/IfTryCatch.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/IfTryCatch.kt");
     }
 
     @TestMetadata("InAnnotationClassScope.kt")
     public void testInAnnotationClassScope() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt");
     }
 
     @TestMetadata("InArgumentList.kt")
     public void testInArgumentList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InArgumentList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InArgumentList.kt");
     }
 
     @TestMetadata("InBlockComment.kt")
     public void testInBlockComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InBlockComment.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InBlockComment.kt");
     }
 
     @TestMetadata("InChar.kt")
     public void testInChar() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InChar.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InChar.kt");
     }
 
     @TestMetadata("InClassBeforeFun.kt")
     public void testInClassBeforeFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassBeforeFun.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InClassBeforeFun.kt");
     }
 
     @TestMetadata("InClassNoCompletionInValName.kt")
     public void testInClassNoCompletionInValName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt");
     }
 
     @TestMetadata("InClassProperty.kt")
     public void testInClassProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassProperty.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InClassProperty.kt");
     }
 
     @TestMetadata("InClassScope.kt")
     public void testInClassScope() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassScope.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InClassScope.kt");
     }
 
     @TestMetadata("InClassTypeParameters.kt")
     public void testInClassTypeParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassTypeParameters.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InClassTypeParameters.kt");
     }
 
     @TestMetadata("InCodeBlock.kt")
     public void testInCodeBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InCodeBlock.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InCodeBlock.kt");
     }
 
     @TestMetadata("InElse.kt")
     public void testInElse() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InElse.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InElse.kt");
     }
 
     @TestMetadata("InEnumScope1.kt")
     public void testInEnumScope1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InEnumScope1.kt");
     }
 
     @TestMetadata("InEnumScope2.kt")
     public void testInEnumScope2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InEnumScope2.kt");
     }
 
     @TestMetadata("InFunctionExpressionBody.kt")
     public void testInFunctionExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt");
     }
 
     @TestMetadata("InFunctionName.kt")
     public void testInFunctionName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InFunctionName.kt");
     }
 
     @TestMetadata("InFunctionRecieverType.kt")
     public void testInFunctionRecieverType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt");
     }
 
     @TestMetadata("InFunctionTypePosition.kt")
     public void testInFunctionTypePosition() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt");
     }
 
     @TestMetadata("InGetterExpressionBody.kt")
     public void testInGetterExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt");
     }
 
     @TestMetadata("InIf.kt")
     public void testInIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InIf.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InIf.kt");
     }
 
     @TestMetadata("InInterfaceScope.kt")
     public void testInInterfaceScope() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InInterfaceScope.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InInterfaceScope.kt");
     }
 
     @TestMetadata("InMemberFunParametersList.kt")
     public void testInMemberFunParametersList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt");
     }
 
     @TestMetadata("InModifierListInsideClass.kt")
     public void testInModifierListInsideClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt");
     }
 
     @TestMetadata("InNotFinishedGenericWithFunAfter.kt")
     public void testInNotFinishedGenericWithFunAfter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt");
     }
 
     @TestMetadata("InObjectScope.kt")
     public void testInObjectScope() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InObjectScope.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InObjectScope.kt");
     }
 
     @TestMetadata("InParameterDefaultValue.kt")
     public void testInParameterDefaultValue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt");
     }
 
     @TestMetadata("InPrimaryConstructorParametersList.kt")
     public void testInPrimaryConstructorParametersList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt");
     }
 
     @TestMetadata("InPropertyInitializer.kt")
     public void testInPropertyInitializer() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyInitializer.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InPropertyInitializer.kt");
     }
 
     @TestMetadata("InPropertyTypeReference.kt")
     public void testInPropertyTypeReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt");
     }
 
     @TestMetadata("InString.kt")
     public void testInString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InString.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InString.kt");
     }
 
     @TestMetadata("InTopFunParametersList.kt")
     public void testInTopFunParametersList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopFunParametersList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InTopFunParametersList.kt");
     }
 
     @TestMetadata("InTopScopeAfterPackage.kt")
     public void testInTopScopeAfterPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt");
     }
 
     @TestMetadata("InTypePosition.kt")
     public void testInTypePosition() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTypePosition.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/InTypePosition.kt");
     }
 
     @TestMetadata("LabeledLambdaThis.kt")
     public void testLabeledLambdaThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt");
     }
 
     @TestMetadata("LineComment.kt")
     public void testLineComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LineComment.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/LineComment.kt");
     }
 
     @TestMetadata("NoBreak1.kt")
     public void testNoBreak1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoBreak1.kt");
     }
 
     @TestMetadata("NoBreak2.kt")
     public void testNoBreak2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoBreak2.kt");
     }
 
     @TestMetadata("NoCompanionThis.kt")
     public void testNoCompanionThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompanionThis.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoCompanionThis.kt");
     }
 
     @TestMetadata("NoCompletionForCapitalPrefix.kt")
     public void testNoCompletionForCapitalPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt");
     }
 
     @TestMetadata("NoContinue.kt")
     public void testNoContinue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoContinue.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoContinue.kt");
     }
 
     @TestMetadata("NoFinalInParameterList.kt")
     public void testNoFinalInParameterList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt");
     }
 
     @TestMetadata("NotInNotIs.kt")
     public void testNotInNotIs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NotInNotIs.kt");
     }
 
     @TestMetadata("NotInNotIs2.kt")
     public void testNotInNotIs2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/NotInNotIs2.kt");
     }
 
     @TestMetadata("PrefixMatcher.kt")
     public void testPrefixMatcher() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PrefixMatcher.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/PrefixMatcher.kt");
     }
 
     @TestMetadata("PropertyAccessors.kt")
     public void testPropertyAccessors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/PropertyAccessors.kt");
     }
 
     @TestMetadata("PropertyAccessors2.kt")
     public void testPropertyAccessors2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/PropertyAccessors2.kt");
     }
 
     @TestMetadata("PropertySetter.kt")
     public void testPropertySetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertySetter.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/PropertySetter.kt");
     }
 
     @TestMetadata("QualifiedThis.kt")
     public void testQualifiedThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThis.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/QualifiedThis.kt");
     }
 
     @TestMetadata("QualifiedThisInAccessor.kt")
     public void testQualifiedThisInAccessor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt");
     }
 
     @TestMetadata("Receiver.kt")
     public void testReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Receiver.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Receiver.kt");
     }
 
     @TestMetadata("Return1.kt")
     public void testReturn1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return1.kt");
     }
 
     @TestMetadata("Return2.kt")
     public void testReturn2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return2.kt");
     }
 
     @TestMetadata("Return3.kt")
     public void testReturn3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return3.kt");
     }
 
     @TestMetadata("Return4.kt")
     public void testReturn4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return4.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return4.kt");
     }
 
     @TestMetadata("Return5.kt")
     public void testReturn5() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return5.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return5.kt");
     }
 
     @TestMetadata("Return6.kt")
     public void testReturn6() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return6.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return6.kt");
     }
 
     @TestMetadata("Return7.kt")
     public void testReturn7() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return7.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return7.kt");
     }
 
     @TestMetadata("Return8.kt")
     public void testReturn8() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return8.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return8.kt");
     }
 
     @TestMetadata("Return9.kt")
     public void testReturn9() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return9.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/Return9.kt");
     }
 
     @TestMetadata("ReturnBoolean.kt")
     public void testReturnBoolean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnBoolean.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnBoolean.kt");
     }
 
     @TestMetadata("ReturnCollection.kt")
     public void testReturnCollection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnCollection.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnCollection.kt");
     }
 
     @TestMetadata("ReturnIterable.kt")
     public void testReturnIterable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnIterable.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnIterable.kt");
     }
 
     @TestMetadata("ReturnKeywordName.kt")
     public void testReturnKeywordName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnKeywordName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnKeywordName.kt");
     }
 
     @TestMetadata("ReturnList.kt")
     public void testReturnList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnList.kt");
     }
 
     @TestMetadata("ReturnNotNull.kt")
     public void testReturnNotNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNotNull.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnNotNull.kt");
     }
 
     @TestMetadata("ReturnNull.kt")
     public void testReturnNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNull.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnNull.kt");
     }
 
     @TestMetadata("ReturnNullableBoolean.kt")
     public void testReturnNullableBoolean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt");
     }
 
     @TestMetadata("ReturnSet.kt")
     public void testReturnSet() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnSet.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ReturnSet.kt");
     }
 
     @TestMetadata("SuspendInsideTypeArguments.kt")
     public void testSuspendInsideTypeArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/SuspendInsideTypeArguments.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/SuspendInsideTypeArguments.kt");
     }
 
     @TestMetadata("SuspendInsideTypeArguments1.kt")
     public void testSuspendInsideTypeArguments1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/SuspendInsideTypeArguments1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/SuspendInsideTypeArguments1.kt");
     }
 
     @TestMetadata("This.kt")
     public void testThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/This.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/This.kt");
     }
 
     @TestMetadata("ThisPrefixMatching.kt")
     public void testThisPrefixMatching() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt");
     }
 
     @TestMetadata("TopScope.kt")
     public void testTopScope() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/TopScope.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/TopScope.kt");
     }
 
     @TestMetadata("UseSiteTargetForPrimaryConstructorParameter.kt")
     public void testUseSiteTargetForPrimaryConstructorParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java

@@ -21,181 +21,156 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInInjava() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("AnnotationParameter.java")
     public void testAnnotationParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/AnnotationParameter.java");
     }
 
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Class.java");
     }
 
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassMembers.java");
     }
 
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassObject.java");
     }
 
     @TestMetadata("ClassObjectField.java")
     public void testClassObjectField() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassObjectField.java");
     }
 
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
     }
 
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/EnumConstants.java");
     }
 
     @TestMetadata("InterfaceDefaultImpl.java")
     public void testInterfaceDefaultImpl() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
     }
 
     @TestMetadata("InterfaceDefaultImplImportedMembers.java")
     public void testInterfaceDefaultImplImportedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplMembers.java")
     public void testInterfaceDefaultImplMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java")
     public void testInterfaceDefaultImplStaticImportedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
     }
 
     @TestMetadata("InterfaceDefaultImplsNonImported.java")
     public void testInterfaceDefaultImplsNonImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java");
     }
 
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacade.java");
     }
 
     @TestMetadata("MultiFileFacadeMembers.java")
     public void testMultiFileFacadeMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
     }
 
     @TestMetadata("MultiFileFacadeNoImport.java")
     public void testMultiFileFacadeNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
     }
 
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Nested.java");
     }
 
     @TestMetadata("NestedClassMembers.java")
     public void testNestedClassMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedClassMembers.java");
     }
 
     @TestMetadata("NestedClassMembers2.java")
     public void testNestedClassMembers2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedClassMembers2.java");
     }
 
     @TestMetadata("NestedNoImport.java")
     public void testNestedNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedNoImport.java");
     }
 
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/NestedObjectInstance.java");
     }
 
     @TestMetadata("ObjectInClassObjects.java")
     public void testObjectInClassObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
     }
 
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/ObjectInstance.java");
     }
 
     @TestMetadata("RenamedFacade.java")
     public void testRenamedFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/RenamedFacade.java");
     }
 
     @TestMetadata("SingleFileFacade.java")
     public void testSingleFileFacade() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacade.java");
     }
 
     @TestMetadata("SingleFileFacadeMembers.java")
     public void testSingleFileFacadeMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
     }
 
     @TestMetadata("SingleFileFacadeNoImport.java")
     public void testSingleFileFacadeNoImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
     }
 
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/Subpackage.java");
     }
 
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/TopLevelMembers.java");
     }
 
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/TraitMember.java");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinStdLibInJavaCompletionTestGenerated.java

@@ -21,13 +21,16 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinStdLibInJavaCompletionTestGenerated extends AbstractKotlinStdLibInJavaCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInStdlib() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava/stdlib"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("List.java")
     public void testList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/stdlib/List.java");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/injava/stdlib/List.java");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java

@@ -21,427 +21,361 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMultifile() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/multifile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("CallableReferenceNotImported")
     public void testCallableReferenceNotImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/");
     }
 
     @TestMetadata("CallableReferenceNotImportedExtension")
     public void testCallableReferenceNotImportedExtension() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/");
     }
 
     @TestMetadata("CallableReferenceNotImportedExtension2")
     public void testCallableReferenceNotImportedExtension2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension2/");
     }
 
     @TestMetadata("CallablesInExcludedPackage")
     public void testCallablesInExcludedPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/");
     }
 
     @TestMetadata("ClassInExcludedPackage")
     public void testClassInExcludedPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/");
     }
 
     @TestMetadata("CompleteFunctionWithNoSpecifiedType")
     public void testCompleteFunctionWithNoSpecifiedType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
     }
 
     @TestMetadata("CompleteImportedFunction")
     public void testCompleteImportedFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/");
     }
 
     @TestMetadata("CompletionOnImportedFunction")
     public void testCompletionOnImportedFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/");
     }
 
     @TestMetadata("DoNotCompleteWithConstraints")
     public void testDoNotCompleteWithConstraints() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/");
     }
 
     @TestMetadata("EntriesOfNotImportedEnumFromKotlin")
     public void testEntriesOfNotImportedEnumFromKotlin() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EntriesOfNotImportedEnumFromKotlin/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/EntriesOfNotImportedEnumFromKotlin/");
     }
 
     @TestMetadata("EnumEntry")
     public void testEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EnumEntry/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/EnumEntry/");
     }
 
     @TestMetadata("ExactMatchPreferImported")
     public void testExactMatchPreferImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExactMatchPreferImported/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExactMatchPreferImported/");
     }
 
     @TestMetadata("ExcludedClass")
     public void testExcludedClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedClass/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExcludedClass/");
     }
 
     @TestMetadata("ExcludedJavaClass")
     public void testExcludedJavaClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/");
     }
 
     @TestMetadata("ExtensionFunction")
     public void testExtensionFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExtensionFunction/");
     }
 
     @TestMetadata("ExtensionFunctionOnImportedFunction")
     public void testExtensionFunctionOnImportedFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/");
     }
 
     @TestMetadata("ExtensionOnNullable")
     public void testExtensionOnNullable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/");
     }
 
     @TestMetadata("ExtensionsAndGetPrefix")
     public void testExtensionsAndGetPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsAndGetPrefix/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExtensionsAndGetPrefix/");
     }
 
     @TestMetadata("ExtensionsForSmartCast")
     public void testExtensionsForSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/");
     }
 
     @TestMetadata("FileRefInStringLiteral")
     public void testFileRefInStringLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/FileRefInStringLiteral/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/FileRefInStringLiteral/");
     }
 
     @TestMetadata("FileRefInStringLiteralNoPrefix")
     public void testFileRefInStringLiteralNoPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/FileRefInStringLiteralNoPrefix/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/FileRefInStringLiteralNoPrefix/");
     }
 
     @TestMetadata("GroovyClassNameCompletionFromDefaultPackage")
     public void testGroovyClassNameCompletionFromDefaultPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
     }
 
     @TestMetadata("GroovyClassNameCompletionFromNonDefaultPackage")
     public void testGroovyClassNameCompletionFromNonDefaultPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
     }
 
     @TestMetadata("HiddenDeclarations")
     public void testHiddenDeclarations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/");
     }
 
     @TestMetadata("InImport")
     public void testInImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImport/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/InImport/");
     }
 
     @TestMetadata("InImportedFunctionLiteralParameter")
     public void testInImportedFunctionLiteralParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/");
     }
 
     @TestMetadata("IncorrectGetters")
     public void testIncorrectGetters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/IncorrectGetters/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/IncorrectGetters/");
     }
 
     @TestMetadata("JavaCallableReference")
     public void testJavaCallableReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaCallableReference/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/JavaCallableReference/");
     }
 
     @TestMetadata("JavaInnerClasses")
     public void testJavaInnerClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/");
     }
 
     @TestMetadata("KT12124")
     public void testKT12124() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/KT12124/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/KT12124/");
     }
 
     @TestMetadata("KT9835")
     public void testKT9835() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/KT9835/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/KT9835/");
     }
 
     @TestMetadata("MoreSpecificExtensionGeneric")
     public void testMoreSpecificExtensionGeneric() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/");
     }
 
     @TestMetadata("MoreSpecificExtensionInDifferentPackage")
     public void testMoreSpecificExtensionInDifferentPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/");
     }
 
     @TestMetadata("MoreSpecificExtensionIsPrivate")
     public void testMoreSpecificExtensionIsPrivate() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/");
     }
 
     @TestMetadata("NoAutoInsertionOfNotImported")
     public void testNoAutoInsertionOfNotImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/");
     }
 
     @TestMetadata("NoExtForOuterFromNested")
     public void testNoExtForOuterFromNested() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/");
     }
 
     @TestMetadata("NoExtensionMethodDuplication")
     public void testNoExtensionMethodDuplication() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/");
     }
 
     @TestMetadata("NoGenericFunDuplication")
     public void testNoGenericFunDuplication() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/");
     }
 
     @TestMetadata("NotImportedExtensionForImplicitReceiver")
     public void testNotImportedExtensionForImplicitReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/");
     }
 
     @TestMetadata("NotImportedExtensionFunction")
     public void testNotImportedExtensionFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/");
     }
 
     @TestMetadata("NotImportedExtensionFunction2")
     public void testNotImportedExtensionFunction2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/");
     }
 
     @TestMetadata("NotImportedExtensionFunction3")
     public void testNotImportedExtensionFunction3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/");
     }
 
     @TestMetadata("NotImportedExtensionFunctionAndAlias")
     public void testNotImportedExtensionFunctionAndAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/");
     }
 
     @TestMetadata("NotImportedExtensionProperty")
     public void testNotImportedExtensionProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/");
     }
 
     @TestMetadata("NotImportedFunction")
     public void testNotImportedFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedFunction/");
     }
 
     @TestMetadata("NotImportedInfixExtension")
     public void testNotImportedInfixExtension() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/");
     }
 
     @TestMetadata("NotImportedJavaClass")
     public void testNotImportedJavaClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/");
     }
 
     @TestMetadata("NotImportedObject")
     public void testNotImportedObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedObject/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedObject/");
     }
 
     @TestMetadata("NotImportedProperty")
     public void testNotImportedProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedProperty/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/NotImportedProperty/");
     }
 
     @TestMetadata("ObjectInTypePosition")
     public void testObjectInTypePosition() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/");
     }
 
     @TestMetadata("ObjectMembers")
     public void testObjectMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectMembers/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ObjectMembers/");
     }
 
     @TestMetadata("ParameterNameAndTypeForNotImportedAlias")
     public void testParameterNameAndTypeForNotImportedAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeForNotImportedAlias/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeForNotImportedAlias/");
     }
 
     @TestMetadata("ParameterNameAndTypeNestedClasses")
     public void testParameterNameAndTypeNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/");
     }
 
     @TestMetadata("PreferMemberToExtension")
     public void testPreferMemberToExtension() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/");
     }
 
     @TestMetadata("PreferMemberToGlobal")
     public void testPreferMemberToGlobal() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/");
     }
 
     @TestMetadata("PreferMoreSpecificExtension1")
     public void testPreferMoreSpecificExtension1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/");
     }
 
     @TestMetadata("PreferMoreSpecificExtension2")
     public void testPreferMoreSpecificExtension2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/");
     }
 
     @TestMetadata("PreferMoreSpecificExtension3")
     public void testPreferMoreSpecificExtension3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/");
     }
 
     @TestMetadata("PropertyKeysEmptyString")
     public void testPropertyKeysEmptyString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/");
     }
 
     @TestMetadata("PropertyKeysNoPrefix")
     public void testPropertyKeysNoPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/");
     }
 
     @TestMetadata("PropertyKeysWithPrefix")
     public void testPropertyKeysWithPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/");
     }
 
     @TestMetadata("StaticMembersOfNotImportedClassFromJava")
     public void testStaticMembersOfNotImportedClassFromJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromJava/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromJava/");
     }
 
     @TestMetadata("StaticMembersOfNotImportedClassFromKotlin")
     public void testStaticMembersOfNotImportedClassFromKotlin() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromKotlin/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromKotlin/");
     }
 
     @TestMetadata("StaticMembersOfNotImportedClassFromKotlinObject")
     public void testStaticMembersOfNotImportedClassFromKotlinObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromKotlinObject/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassFromKotlinObject/");
     }
 
     @TestMetadata("StaticMembersOfNotImportedClassNameConflict")
     public void testStaticMembersOfNotImportedClassNameConflict() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassNameConflict/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/StaticMembersOfNotImportedClassNameConflict/");
     }
 
     @TestMetadata("SyntheticExtensionDeprecated")
     public void testSyntheticExtensionDeprecated() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/");
     }
 
     @TestMetadata("SyntheticExtensionForGenericClass")
     public void testSyntheticExtensionForGenericClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/");
     }
 
     @TestMetadata("SyntheticExtensionNonVoidSetter")
     public void testSyntheticExtensionNonVoidSetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionNonVoidSetter/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/SyntheticExtensionNonVoidSetter/");
     }
 
     @TestMetadata("TopLevelFunction")
     public void testTopLevelFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TopLevelFunction/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/TopLevelFunction/");
     }
 
     @TestMetadata("TypeAliases")
     public void testTypeAliases() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TypeAliases/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/multifile/TypeAliases/");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java

@@ -21,133 +21,116 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiFileSmartCompletionTestGenerated extends AbstractMultiFileSmartCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInSmartMultiFile() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smartMultiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("AnonymousObjectGenericJava")
     public void testAnonymousObjectGenericJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/");
     }
 
     @TestMetadata("CallableReferenceNotImported")
     public void testCallableReferenceNotImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/");
     }
 
     @TestMetadata("CallablesInExcludedPackage")
     public void testCallablesInExcludedPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/");
     }
 
     @TestMetadata("FunctionFromAnotherPackage")
     public void testFunctionFromAnotherPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/");
     }
 
     @TestMetadata("GenericInheritors1")
     public void testGenericInheritors1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/");
     }
 
     @TestMetadata("GenericInheritors2")
     public void testGenericInheritors2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/");
     }
 
     @TestMetadata("GenericInheritors3")
     public void testGenericInheritors3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/");
     }
 
     @TestMetadata("GenericInheritors4")
     public void testGenericInheritors4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/");
     }
 
     @TestMetadata("InheritorInTheSameFile")
     public void testInheritorInTheSameFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/");
     }
 
     @TestMetadata("Inheritors")
     public void testInheritors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/Inheritors/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/Inheritors/");
     }
 
     @TestMetadata("InheritorsAndMultipleExpectedTypes")
     public void testInheritorsAndMultipleExpectedTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/");
     }
 
     @TestMetadata("JavaStaticMethodArgument")
     public void testJavaStaticMethodArgument() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/");
     }
 
     @TestMetadata("JavaStaticMethodArgument2")
     public void testJavaStaticMethodArgument2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/");
     }
 
     @TestMetadata("KT_8751")
     public void testKT_8751() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/KT_8751/");
     }
 
     @TestMetadata("KT_8751_2")
     public void testKT_8751_2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/KT_8751_2/");
     }
 
     @TestMetadata("NestedClassAfterAs")
     public void testNestedClassAfterAs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/");
     }
 
     @TestMetadata("NoObjectDuplication")
     public void testNoObjectDuplication() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");
     }
 
     @TestMetadata("NotImportedContains")
     public void testNotImportedContains() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NotImportedContains/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/NotImportedContains/");
     }
 
     @TestMetadata("NotImportedGetValue")
     public void testNotImportedGetValue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NotImportedGetValue/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/NotImportedGetValue/");
     }
 
     @TestMetadata("StaticMembers1")
     public void testStaticMembers1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/StaticMembers1/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/StaticMembers1/");
     }
 
     @TestMetadata("StaticMembers2")
     public void testStaticMembers2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/StaticMembers2/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/smartMultiFile/StaticMembers2/");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiPlatformCompletionTestGenerated.java

@@ -21,31 +21,31 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiPlatformCompletionTestGenerated extends AbstractMultiPlatformCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMultiPlatform() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/multiPlatform"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("classInCommon")
     public void testClassInCommon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/multiPlatform/classInCommon/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/multiPlatform/classInCommon/");
     }
 
     @TestMetadata("classInPlatform")
     public void testClassInPlatform() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/multiPlatform/classInPlatform/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/multiPlatform/classInPlatform/");
     }
 
     @TestMetadata("functionInCommon")
     public void testFunctionInCommon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/multiPlatform/functionInCommon/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/multiPlatform/functionInCommon/");
     }
 
     @TestMetadata("functionInPlatform")
     public void testFunctionInPlatform() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/multiPlatform/functionInPlatform/");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/multiPlatform/functionInPlatform/");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java

@@ -21,193 +21,166 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompletionCharFilterTestGenerated extends AbstractCompletionCharFilterTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInCharFilter() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/charFilter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("Colon.kt")
     public void testColon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Colon.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Colon.kt");
     }
 
     @TestMetadata("Comma1.kt")
     public void testComma1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Comma1.kt");
     }
 
     @TestMetadata("Comma2.kt")
     public void testComma2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Comma2.kt");
     }
 
     @TestMetadata("Comma3.kt")
     public void testComma3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Comma3.kt");
     }
 
     @TestMetadata("Comma4.kt")
     public void testComma4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma4.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Comma4.kt");
     }
 
     @TestMetadata("Comma5.kt")
     public void testComma5() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma5.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Comma5.kt");
     }
 
     @TestMetadata("CommaForFunction1.kt")
     public void testCommaForFunction1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt");
     }
 
     @TestMetadata("CommaForFunction2.kt")
     public void testCommaForFunction2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt");
     }
 
     @TestMetadata("ConstructorWithLambdaArg1.kt")
     public void testConstructorWithLambdaArg1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt");
     }
 
     @TestMetadata("ConstructorWithLambdaArg2.kt")
     public void testConstructorWithLambdaArg2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt");
     }
 
     @TestMetadata("Dot.kt")
     public void testDot() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Dot.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Dot.kt");
     }
 
     @TestMetadata("DotAfterFun1.kt")
     public void testDotAfterFun1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt");
     }
 
     @TestMetadata("DotAfterFun2.kt")
     public void testDotAfterFun2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt");
     }
 
     @TestMetadata("Eq1.kt")
     public void testEq1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Eq1.kt");
     }
 
     @TestMetadata("Eq2.kt")
     public void testEq2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Eq2.kt");
     }
 
     @TestMetadata("FunctionLiteralParameter1.kt")
     public void testFunctionLiteralParameter1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt");
     }
 
     @TestMetadata("FunctionLiteralParameter2.kt")
     public void testFunctionLiteralParameter2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt");
     }
 
     @TestMetadata("FunctionLiteralParameter3.kt")
     public void testFunctionLiteralParameter3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt");
     }
 
     @TestMetadata("FunctionWithLambdaArg1.kt")
     public void testFunctionWithLambdaArg1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt");
     }
 
     @TestMetadata("FunctionWithLambdaArg2.kt")
     public void testFunctionWithLambdaArg2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt");
     }
 
     @TestMetadata("InfixCallAndSpace.kt")
     public void testInfixCallAndSpace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt");
     }
 
     @TestMetadata("KeywordAndSpace.kt")
     public void testKeywordAndSpace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt");
     }
 
     @TestMetadata("LParenth.kt")
     public void testLParenth() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/LParenth.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/LParenth.kt");
     }
 
     @TestMetadata("NamedParameter1.kt")
     public void testNamedParameter1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt");
     }
 
     @TestMetadata("NamedParameter2.kt")
     public void testNamedParameter2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt");
     }
 
     @TestMetadata("QualifiedThis.kt")
     public void testQualifiedThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt");
     }
 
     @TestMetadata("RangeTyping.kt")
     public void testRangeTyping() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt");
     }
 
     @TestMetadata("Space.kt")
     public void testSpace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Space.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/Space.kt");
     }
 
     @TestMetadata("VariableName.kt")
     public void testVariableName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/VariableName.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/VariableName.kt");
     }
 
     @TestMetadata("VariableName2.kt")
     public void testVariableName2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/VariableName2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/VariableName2.kt");
     }
 
     @TestMetadata("VariableName3.kt")
     public void testVariableName3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/VariableName3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/charFilter/VariableName3.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KeywordCompletionHandlerTestGenerated extends AbstractKeywordCompletionHandlerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("AddCompanionToObject.kt")
     public void testAddCompanionToObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt");
     }
 
     public void testAllFilesPresentInKeywords() throws Exception {
@@ -33,205 +36,171 @@ public class KeywordCompletionHandlerTestGenerated extends AbstractKeywordComple
 
     @TestMetadata("Break.kt")
     public void testBreak() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Break.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Break.kt");
     }
 
     @TestMetadata("Catch.kt")
     public void testCatch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Catch.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Catch.kt");
     }
 
     @TestMetadata("CompanionObject.kt")
     public void testCompanionObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt");
     }
 
     @TestMetadata("Constructor.kt")
     public void testConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Constructor.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Constructor.kt");
     }
 
     @TestMetadata("ConstructorPrimary.kt")
     public void testConstructorPrimary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt");
     }
 
     @TestMetadata("Do.kt")
     public void testDo() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Do.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Do.kt");
     }
 
     @TestMetadata("FileKeyword.kt")
     public void testFileKeyword() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt");
     }
 
     @TestMetadata("Finally.kt")
     public void testFinally() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Finally.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Finally.kt");
     }
 
     @TestMetadata("For.kt")
     public void testFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/For.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/For.kt");
     }
 
     @TestMetadata("Getter1.kt")
     public void testGetter1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Getter1.kt");
     }
 
     @TestMetadata("Getter2.kt")
     public void testGetter2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Getter2.kt");
     }
 
     @TestMetadata("If.kt")
     public void testIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/If.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/If.kt");
     }
 
     @TestMetadata("IfLParenth.kt")
     public void testIfLParenth() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/IfLParenth.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/IfLParenth.kt");
     }
 
     @TestMetadata("IfParansOnNextLine.kt")
     public void testIfParansOnNextLine() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt");
     }
 
     @TestMetadata("IfSpace.kt")
     public void testIfSpace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/IfSpace.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/IfSpace.kt");
     }
 
     @TestMetadata("Init.kt")
     public void testInit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Init.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Init.kt");
     }
 
     @TestMetadata("NoSpaceAfterNull.kt")
     public void testNoSpaceAfterNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt");
     }
 
     @TestMetadata("QualifiedReturnNonUnit.kt")
     public void testQualifiedReturnNonUnit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt");
     }
 
     @TestMetadata("QualifiedReturnNonUnitExplicit.kt")
     public void testQualifiedReturnNonUnitExplicit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt");
     }
 
     @TestMetadata("QualifiedReturnUnit.kt")
     public void testQualifiedReturnUnit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt");
     }
 
     @TestMetadata("ReturnEmptyList.kt")
     public void testReturnEmptyList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt");
     }
 
     @TestMetadata("ReturnInEmptyType.kt")
     public void testReturnInEmptyType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt");
     }
 
     @TestMetadata("ReturnInProperty.kt")
     public void testReturnInProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt");
     }
 
     @TestMetadata("ReturnInTypeFunction.kt")
     public void testReturnInTypeFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt");
     }
 
     @TestMetadata("ReturnInUnit.kt")
     public void testReturnInUnit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt");
     }
 
     @TestMetadata("ReturnNull.kt")
     public void testReturnNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt");
     }
 
     @TestMetadata("Setter1.kt")
     public void testSetter1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Setter1.kt");
     }
 
     @TestMetadata("Setter2.kt")
     public void testSetter2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Setter2.kt");
     }
 
     @TestMetadata("SpaceAfterImport.kt")
     public void testSpaceAfterImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt");
     }
 
     @TestMetadata("Try.kt")
     public void testTry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Try.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/Try.kt");
     }
 
     @TestMetadata("UseSiteAnnotationTarget1.kt")
     public void testUseSiteAnnotationTarget1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt");
     }
 
     @TestMetadata("UseSiteAnnotationTarget2.kt")
     public void testUseSiteAnnotationTarget2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt");
     }
 
     @TestMetadata("UseSiteAnnotationTarget3.kt")
     public void testUseSiteAnnotationTarget3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt");
     }
 
     @TestMetadata("While.kt")
     public void testWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/While.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/keywords/While.kt");
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletionWeigherTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("AfterNullable.kt")
     public void testAfterNullable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/AfterNullable.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/AfterNullable.kt");
     }
 
     public void testAllFilesPresentInBasic() throws Exception {
@@ -33,186 +36,160 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
 
     @TestMetadata("CallableReference_NothingLast.kt")
     public void testCallableReference_NothingLast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/CallableReference_NothingLast.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/CallableReference_NothingLast.kt");
     }
 
     @TestMetadata("Callables.kt")
     public void testCallables() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Callables.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/Callables.kt");
     }
 
     @TestMetadata("DelegateToOtherObject.kt")
     public void testDelegateToOtherObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DelegateToOtherObject.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DelegateToOtherObject.kt");
     }
 
     @TestMetadata("DeprecatedFun.kt")
     public void testDeprecatedFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt");
     }
 
     @TestMetadata("DeprecatedJavaClass.kt")
     public void testDeprecatedJavaClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt");
     }
 
     @TestMetadata("DslCallWithExpectedType.kt")
     public void testDslCallWithExpectedType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DslCallWithExpectedType.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DslCallWithExpectedType.kt");
     }
 
     @TestMetadata("DslCalls.kt")
     public void testDslCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DslCalls.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DslCalls.kt");
     }
 
     @TestMetadata("DslCallsWithMultipleReceivers.kt")
     public void testDslCallsWithMultipleReceivers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DslCallsWithMultipleReceivers.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/DslCallsWithMultipleReceivers.kt");
     }
 
     @TestMetadata("ExactMatchForKeyword.kt")
     public void testExactMatchForKeyword() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt");
     }
 
     @TestMetadata("ImportedFirst.kt")
     public void testImportedFirst() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt");
     }
 
     @TestMetadata("ImportedFirstForJavaClass.kt")
     public void testImportedFirstForJavaClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt");
     }
 
     @TestMetadata("ImportedOrder.kt")
     public void testImportedOrder() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt");
     }
 
     @TestMetadata("KeywordsLast.kt")
     public void testKeywordsLast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt");
     }
 
     @TestMetadata("LambdaSignature.kt")
     public void testLambdaSignature() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LambdaSignature.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/LambdaSignature.kt");
     }
 
     @TestMetadata("LocalFileBeforeImported.kt")
     public void testLocalFileBeforeImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt");
     }
 
     @TestMetadata("LocalValuesAndParams.kt")
     public void testLocalValuesAndParams() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt");
     }
 
     @TestMetadata("LocalsBeforeKeywords.kt")
     public void testLocalsBeforeKeywords() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt");
     }
 
     @TestMetadata("LocalsPropertiesKeywords.kt")
     public void testLocalsPropertiesKeywords() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt");
     }
 
     @TestMetadata("NamedParameters.kt")
     public void testNamedParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/NamedParameters.kt");
     }
 
     @TestMetadata("NamedParameters2.kt")
     public void testNamedParameters2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/NamedParameters2.kt");
     }
 
     @TestMetadata("NamedParameters3.kt")
     public void testNamedParameters3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/NamedParameters3.kt");
     }
 
     @TestMetadata("Packages.kt")
     public void testPackages() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Packages.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/Packages.kt");
     }
 
     @TestMetadata("ParametersBeforeKeywords.kt")
     public void testParametersBeforeKeywords() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt");
     }
 
     @TestMetadata("PreferFromJdk.kt")
     public void testPreferFromJdk() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt");
     }
 
     @TestMetadata("PreferGetMethodToProperty.kt")
     public void testPreferGetMethodToProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferGetMethodToProperty.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/PreferGetMethodToProperty.kt");
     }
 
     @TestMetadata("Prefix.kt")
     public void testPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Prefix.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/Prefix.kt");
     }
 
     @TestMetadata("PropertiesBeforeKeywords.kt")
     public void testPropertiesBeforeKeywords() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt");
     }
 
     @TestMetadata("StaticMembers.kt")
     public void testStaticMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/StaticMembers.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/StaticMembers.kt");
     }
 
     @TestMetadata("SuperMembers.kt")
     public void testSuperMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/SuperMembers.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/basic/SuperMembers.kt");
     }
 
     @TestMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExpectedInfo extends AbstractBasicCompletionWeigherTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("AfterAs.kt")
         public void testAfterAs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt");
         }
 
         public void testAllFilesPresentInExpectedInfo() throws Exception {
@@ -221,86 +198,72 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
 
         @TestMetadata("CompanionObjectMethod.kt")
         public void testCompanionObjectMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt");
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt");
         }
 
         @TestMetadata("ExpectedType.kt")
         public void testExpectedType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt");
         }
 
         @TestMetadata("ExpectedType2.kt")
         public void testExpectedType2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt");
         }
 
         @TestMetadata("LambdaValue.kt")
         public void testLambdaValue() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt");
         }
 
         @TestMetadata("MultiArgsItem.kt")
         public void testMultiArgsItem() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt");
         }
 
         @TestMetadata("NameSimilarity.kt")
         public void testNameSimilarity() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt");
         }
 
         @TestMetadata("NameSimilarityAndNoExpectedType.kt")
         public void testNameSimilarityAndNoExpectedType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt");
         }
 
         @TestMetadata("NameSimilarityAndNoExpectedType2.kt")
         public void testNameSimilarityAndNoExpectedType2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt");
         }
 
         @TestMetadata("NoStupidComparison.kt")
         public void testNoStupidComparison() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt");
         }
 
         @TestMetadata("Null.kt")
         public void testNull() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt");
         }
 
         @TestMetadata("PreferMatchingThis.kt")
         public void testPreferMatchingThis() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt");
         }
 
         @TestMetadata("TrueFalse.kt")
         public void testTrueFalse() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt");
         }
 
         @TestMetadata("WhenByEnum.kt")
         public void testWhenByEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt");
         }
     }
 
@@ -308,50 +271,47 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ParameterNameAndType extends AbstractBasicCompletionWeigherTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInParameterNameAndType() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/parameterNameAndType"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("Deprecated.kt")
         public void testDeprecated() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt");
         }
 
         @TestMetadata("FromCurrentFilePriority.kt")
         public void testFromCurrentFilePriority() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt");
         }
 
         @TestMetadata("ImportedFirst.kt")
         public void testImportedFirst() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt");
         }
 
         @TestMetadata("MoreWordsMatchFirst.kt")
         public void testMoreWordsMatchFirst() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt");
         }
 
         @TestMetadata("ShorterFirst.kt")
         public void testShorterFirst() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");
         }
 
         @TestMetadata("StartMatchFirst.kt")
         public void testStartMatchFirst() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt");
         }
 
         @TestMetadata("UserPrefix.kt")
         public void testUserPrefix() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt");
         }
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java

@@ -21,229 +21,196 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SmartCompletionWeigherTestGenerated extends AbstractSmartCompletionWeigherTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInSmart() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/smart"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("BooleanExpected.kt")
     public void testBooleanExpected() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt");
     }
 
     @TestMetadata("CallableReference_NothingLast.kt")
     public void testCallableReference_NothingLast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/CallableReference_NothingLast.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/CallableReference_NothingLast.kt");
     }
 
     @TestMetadata("CallableReference_NothingLast2.kt")
     public void testCallableReference_NothingLast2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/CallableReference_NothingLast2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/CallableReference_NothingLast2.kt");
     }
 
     @TestMetadata("FunctionExpected.kt")
     public void testFunctionExpected() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt");
     }
 
     @TestMetadata("It.kt")
     public void testIt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/It.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/It.kt");
     }
 
     @TestMetadata("MultipleArgsItem.kt")
     public void testMultipleArgsItem() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt");
     }
 
     @TestMetadata("NameSimilarity1.kt")
     public void testNameSimilarity1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt");
     }
 
     @TestMetadata("NameSimilarity2.kt")
     public void testNameSimilarity2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt");
     }
 
     @TestMetadata("NameSimilarity3.kt")
     public void testNameSimilarity3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt");
     }
 
     @TestMetadata("NameSimilarityAndCompiledParameters.kt")
     public void testNameSimilarityAndCompiledParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt");
     }
 
     @TestMetadata("NameSimilarityForAssignment.kt")
     public void testNameSimilarityForAssignment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt");
     }
 
     @TestMetadata("NameSimilarityForBlock.kt")
     public void testNameSimilarityForBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt");
     }
 
     @TestMetadata("NameSimilarityForElse.kt")
     public void testNameSimilarityForElse() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt");
     }
 
     @TestMetadata("NameSimilarityForElvis.kt")
     public void testNameSimilarityForElvis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt");
     }
 
     @TestMetadata("NameSimilarityForEq1.kt")
     public void testNameSimilarityForEq1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt");
     }
 
     @TestMetadata("NameSimilarityForEq2.kt")
     public void testNameSimilarityForEq2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt");
     }
 
     @TestMetadata("NameSimilarityForEq3.kt")
     public void testNameSimilarityForEq3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt");
     }
 
     @TestMetadata("NameSimilarityForEq4.kt")
     public void testNameSimilarityForEq4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt");
     }
 
     @TestMetadata("NameSimilarityForExpressionBody.kt")
     public void testNameSimilarityForExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt");
     }
 
     @TestMetadata("NameSimilarityForGetterExpressionBody.kt")
     public void testNameSimilarityForGetterExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt");
     }
 
     @TestMetadata("NameSimilarityForGetterReturn.kt")
     public void testNameSimilarityForGetterReturn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt");
     }
 
     @TestMetadata("NameSimilarityForInitializer.kt")
     public void testNameSimilarityForInitializer() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt");
     }
 
     @TestMetadata("NameSimilarityForReturn.kt")
     public void testNameSimilarityForReturn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt");
     }
 
     @TestMetadata("NameSimilarityForThen.kt")
     public void testNameSimilarityForThen() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt");
     }
 
     @TestMetadata("NameSimilarityForVararg.kt")
     public void testNameSimilarityForVararg() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt");
     }
 
     @TestMetadata("NameSimilarityInImplicitlyTypedVarInitializer.kt")
     public void testNameSimilarityInImplicitlyTypedVarInitializer() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt");
     }
 
     @TestMetadata("NameSimilaritySorterPlacement.kt")
     public void testNameSimilaritySorterPlacement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt");
     }
 
     @TestMetadata("NoExpectedType.kt")
     public void testNoExpectedType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt");
     }
 
     @TestMetadata("NoNameSimilarityForQualifier.kt")
     public void testNoNameSimilarityForQualifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt");
     }
 
     @TestMetadata("NullableExpected.kt")
     public void testNullableExpected() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NullableExpected.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/NullableExpected.kt");
     }
 
     @TestMetadata("ReturnValue1.kt")
     public void testReturnValue1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt");
     }
 
     @TestMetadata("ReturnValue2.kt")
     public void testReturnValue2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt");
     }
 
     @TestMetadata("SmartPriority.kt")
     public void testSmartPriority() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/SmartPriority.kt");
     }
 
     @TestMetadata("SmartPriority2.kt")
     public void testSmartPriority2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt");
     }
 
     @TestMetadata("SmartPriority3.kt")
     public void testSmartPriority3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt");
     }
 
     @TestMetadata("StaticMemberAndPrefix.kt")
     public void testStaticMemberAndPrefix() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/StaticMemberAndPrefix.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/StaticMemberAndPrefix.kt");
     }
 
     @TestMetadata("SuperMembers.kt")
     public void testSuperMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SuperMembers.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/weighers/smart/SuperMembers.kt");
     }
 }

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/GradleConfigureProjectByChangingFileTestGenerated.java

@@ -23,62 +23,57 @@ public class GradleConfigureProjectByChangingFileTestGenerated extends AbstractG
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Gradle extends AbstractGradleConfigureProjectByChangingFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestGradle, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInGradle() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("default")
         public void testDefault() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/default/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/default/");
         }
 
         @TestMetadata("eapVersion")
         public void testEapVersion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/eapVersion/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/eapVersion/");
         }
 
         @TestMetadata("jreLib")
         public void testJreLib() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/jreLib/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/jreLib/");
         }
 
         @TestMetadata("js")
         public void testJs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/js/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/js/");
         }
 
         @TestMetadata("m04Version")
         public void testM04Version() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/m04Version/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/m04Version/");
         }
 
         @TestMetadata("missedLibrary")
         public void testMissedLibrary() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/missedLibrary/");
         }
 
         @TestMetadata("plugin_present")
         public void testPlugin_present() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/plugin_present/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/plugin_present/");
         }
 
         @TestMetadata("rcVersion")
         public void testRcVersion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/rcVersion/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/rcVersion/");
         }
 
         @TestMetadata("withJava9ModuleInfo")
         public void testWithJava9ModuleInfo() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/withJava9ModuleInfo/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gradle/withJava9ModuleInfo/");
         }
     }
 
@@ -86,38 +81,37 @@ public class GradleConfigureProjectByChangingFileTestGenerated extends AbstractG
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Gsk extends AbstractGradleConfigureProjectByChangingFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestGradle, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInGsk() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gsk"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("eap11Version")
         public void testEap11Version() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gsk/eap11Version/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gsk/eap11Version/");
         }
 
         @TestMetadata("eapVersion")
         public void testEapVersion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gsk/eapVersion/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gsk/eapVersion/");
         }
 
         @TestMetadata("helloWorld")
         public void testHelloWorld() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gsk/helloWorld/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gsk/helloWorld/");
         }
 
         @TestMetadata("missedLibrary")
         public void testMissedLibrary() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gsk/missedLibrary/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gsk/missedLibrary/");
         }
 
         @TestMetadata("pluginPresent")
         public void testPluginPresent() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gsk/pluginPresent/");
-            doTestGradle(fileName);
+            runTest("idea/testData/configuration/gsk/pluginPresent/");
         }
     }
 }

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java

@@ -21,91 +21,81 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinMavenInspectionTestGenerated extends AbstractKotlinMavenInspectionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMaven_inspections() throws Exception {
         KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/idea-maven/testData/maven-inspections"), Pattern.compile("^([\\w\\-]+).xml$"), TargetBackend.ANY);
     }
 
     @TestMetadata("bothCompileAndTestCompileInTheSameExecution.xml")
     public void testBothCompileAndTestCompileInTheSameExecution() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml");
     }
 
     @TestMetadata("dependencyWithNoExecution.xml")
     public void testDependencyWithNoExecution() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml");
     }
 
     @TestMetadata("deprecatedJre.xml")
     public void testDeprecatedJre() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/deprecatedJre.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/deprecatedJre.xml");
     }
 
     @TestMetadata("deprecatedJreWithDependencyManagement.xml")
     public void testDeprecatedJreWithDependencyManagement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml");
     }
 
     @TestMetadata("ideAndMavenVersions.xml")
     public void testIdeAndMavenVersions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml");
     }
 
     @TestMetadata("ideAndMavenVersionsSuppression.xml")
     public void testIdeAndMavenVersionsSuppression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/ideAndMavenVersionsSuppression.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/ideAndMavenVersionsSuppression.xml");
     }
 
     @TestMetadata("kotlinTestWithJunit.xml")
     public void testKotlinTestWithJunit() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml");
     }
 
     @TestMetadata("missingDependencies.xml")
     public void testMissingDependencies() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/missingDependencies.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/missingDependencies.xml");
     }
 
     @TestMetadata("noExecutions.xml")
     public void testNoExecutions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/noExecutions.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/noExecutions.xml");
     }
 
     @TestMetadata("oldVersionWithJre.xml")
     public void testOldVersionWithJre() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/oldVersionWithJre.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/oldVersionWithJre.xml");
     }
 
     @TestMetadata("sameVersionPluginLibrary.xml")
     public void testSameVersionPluginLibrary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml");
     }
 
     @TestMetadata("sameVersionPluginLibrarySuppression.xml")
     public void testSameVersionPluginLibrarySuppression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml");
     }
 
     @TestMetadata("wrongJsExecution.xml")
     public void testWrongJsExecution() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml");
     }
 
     @TestMetadata("wrongPhaseExecution.xml")
     public void testWrongPhaseExecution() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/wrongPhaseExecution.xml");
-        doTest(fileName);
+        runTest("idea/idea-maven/testData/maven-inspections/wrongPhaseExecution.xml");
     }
 }

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java

@@ -23,62 +23,57 @@ public class MavenConfigureProjectByChangingFileTestGenerated extends AbstractMa
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Jvm extends AbstractMavenConfigureProjectByChangingFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithMaven, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJvm() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-maven/testData/configurator/jvm"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("fixExisting")
         public void testFixExisting() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/fixExisting/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/fixExisting/");
         }
 
         @TestMetadata("jreLib")
         public void testJreLib() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/jreLib/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/jreLib/");
         }
 
         @TestMetadata("libraryMissed")
         public void testLibraryMissed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/libraryMissed/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/libraryMissed/");
         }
 
         @TestMetadata("pluginMissed")
         public void testPluginMissed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/pluginMissed/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/pluginMissed/");
         }
 
         @TestMetadata("simpleProject")
         public void testSimpleProject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProject/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/simpleProject/");
         }
 
         @TestMetadata("simpleProjectEAP")
         public void testSimpleProjectEAP() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/");
         }
 
         @TestMetadata("simpleProjectRc")
         public void testSimpleProjectRc() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectRc/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/simpleProjectRc/");
         }
 
         @TestMetadata("simpleProjectSnapshot")
         public void testSimpleProjectSnapshot() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/");
         }
 
         @TestMetadata("withJava9ModuleInfo")
         public void testWithJava9ModuleInfo() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/");
-            doTestWithMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/jvm/withJava9ModuleInfo/");
         }
     }
 
@@ -86,32 +81,32 @@ public class MavenConfigureProjectByChangingFileTestGenerated extends AbstractMa
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Js extends AbstractMavenConfigureProjectByChangingFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithJSMaven, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJs() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-maven/testData/configurator/js"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("libraryMissed")
         public void testLibraryMissed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/libraryMissed/");
-            doTestWithJSMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/js/libraryMissed/");
         }
 
         @TestMetadata("pluginMissed")
         public void testPluginMissed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/pluginMissed/");
-            doTestWithJSMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/js/pluginMissed/");
         }
 
         @TestMetadata("simpleProject")
         public void testSimpleProject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/simpleProject/");
-            doTestWithJSMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/js/simpleProject/");
         }
 
         @TestMetadata("simpleProjectSnapshot")
         public void testSimpleProjectSnapshot() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/");
-            doTestWithJSMaven(fileName);
+            runTest("idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java

@@ -21,67 +21,61 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInDataFlowValueRendering() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("classProperty.kt")
     public void testClassProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/classProperty.kt");
     }
 
     @TestMetadata("complexIdentifier.kt")
     public void testComplexIdentifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
     }
 
     @TestMetadata("complexIdentifierWithImplicitReceiver.kt")
     public void testComplexIdentifierWithImplicitReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
     }
 
     @TestMetadata("complexIdentifierWithInitiallyNullableReceiver.kt")
     public void testComplexIdentifierWithInitiallyNullableReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
     }
 
     @TestMetadata("complexIdentifierWithReceiver.kt")
     public void testComplexIdentifierWithReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
     }
 
     @TestMetadata("multipleVariables.kt")
     public void testMultipleVariables() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/multipleVariables.kt");
     }
 
     @TestMetadata("packageProperty.kt")
     public void testPackageProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/packageProperty.kt");
     }
 
     @TestMetadata("receivers.kt")
     public void testReceivers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/receivers.kt");
     }
 
     @TestMetadata("smartCast.kt")
     public void testSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/smartCast.kt");
     }
 
     @TestMetadata("smartNotNull.kt")
     public void testSmartNotNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt");
-        doTest(fileName);
+        runTest("idea/testData/dataFlowValueRendering/smartNotNull.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java

@@ -21,259 +21,221 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AddImportTestGenerated extends AbstractAddImportTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInAddImport() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/addImport"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("CannotImportClass1.kt")
     public void testCannotImportClass1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/CannotImportClass1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/CannotImportClass1.kt");
     }
 
     @TestMetadata("CannotImportClass2.kt")
     public void testCannotImportClass2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/CannotImportClass2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/CannotImportClass2.kt");
     }
 
     @TestMetadata("ClassAlreadyImported1.kt")
     public void testClassAlreadyImported1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ClassAlreadyImported1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ClassAlreadyImported1.kt");
     }
 
     @TestMetadata("ClassAlreadyImported2.kt")
     public void testClassAlreadyImported2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ClassAlreadyImported2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ClassAlreadyImported2.kt");
     }
 
     @TestMetadata("Comments.kt")
     public void testComments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/Comments.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/Comments.kt");
     }
 
     @TestMetadata("CommentsNoPackageDirective.kt")
     public void testCommentsNoPackageDirective() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/CommentsNoPackageDirective.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/CommentsNoPackageDirective.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage1.kt")
     public void testConflictingNameAppearsAndHasUsage1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage2.kt")
     public void testConflictingNameAppearsAndHasUsage2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage3.kt")
     public void testConflictingNameAppearsAndHasUsage3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage4.kt")
     public void testConflictingNameAppearsAndHasUsage4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage5.kt")
     public void testConflictingNameAppearsAndHasUsage5() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsAndHasUsage6.kt")
     public void testConflictingNameAppearsAndHasUsage6() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsButUsageIsQualified.kt")
     public void testConflictingNameAppearsButUsageIsQualified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsFalseUsage.kt")
     public void testConflictingNameAppearsFalseUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsFalseUsage2.kt")
     public void testConflictingNameAppearsFalseUsage2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt");
     }
 
     @TestMetadata("ConflictingNameAppearsNoUsage.kt")
     public void testConflictingNameAppearsNoUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsNoUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameAppearsNoUsage.kt");
     }
 
     @TestMetadata("ConflictingNameHasExplicitImportAlready.kt")
     public void testConflictingNameHasExplicitImportAlready() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt");
     }
 
     @TestMetadata("ConflictingNameNoAllUnderImport.kt")
     public void testConflictingNameNoAllUnderImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameNoAllUnderImport.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameNoAllUnderImport.kt");
     }
 
     @TestMetadata("ConflictingNameNoAllUnderImport2.kt")
     public void testConflictingNameNoAllUnderImport2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameNoAllUnderImport2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameNoAllUnderImport2.kt");
     }
 
     @TestMetadata("ConflictingNameNoAllUnderImport3.kt")
     public void testConflictingNameNoAllUnderImport3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameNoAllUnderImport3.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ConflictingNameNoAllUnderImport3.kt");
     }
 
     @TestMetadata("DropExplicitImports.kt")
     public void testDropExplicitImports() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/DropExplicitImports.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/DropExplicitImports.kt");
     }
 
     @TestMetadata("DropExplicitImports2.kt")
     public void testDropExplicitImports2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/DropExplicitImports2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/DropExplicitImports2.kt");
     }
 
     @TestMetadata("FunctionAlreadyImported1.kt")
     public void testFunctionAlreadyImported1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/FunctionAlreadyImported1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/FunctionAlreadyImported1.kt");
     }
 
     @TestMetadata("FunctionAlreadyImported2.kt")
     public void testFunctionAlreadyImported2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/FunctionAlreadyImported2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/FunctionAlreadyImported2.kt");
     }
 
     @TestMetadata("ImportClassSimple.kt")
     public void testImportClassSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportClassSimple.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportClassSimple.kt");
     }
 
     @TestMetadata("ImportClassWhenFunctionImported.kt")
     public void testImportClassWhenFunctionImported() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportClassWhenFunctionImported.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportClassWhenFunctionImported.kt");
     }
 
     @TestMetadata("ImportEnumMember1.kt")
     public void testImportEnumMember1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportEnumMember1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportEnumMember1.kt");
     }
 
     @TestMetadata("ImportEnumMember2.kt")
     public void testImportEnumMember2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportEnumMember2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportEnumMember2.kt");
     }
 
     @TestMetadata("ImportFromObject.kt")
     public void testImportFromObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportFromObject.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportFromObject.kt");
     }
 
     @TestMetadata("ImportFunctionBug.kt")
     public void testImportFunctionBug() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportFunctionBug.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportFunctionBug.kt");
     }
 
     @TestMetadata("ImportNestedClass.kt")
     public void testImportNestedClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportNestedClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportNestedClass.kt");
     }
 
     @TestMetadata("ImportSecondFunction.kt")
     public void testImportSecondFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/ImportSecondFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/ImportSecondFunction.kt");
     }
 
     @TestMetadata("KeywordNames.kt")
     public void testKeywordNames() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/KeywordNames.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/KeywordNames.kt");
     }
 
     @TestMetadata("NameCountForStarNotReached.kt")
     public void testNameCountForStarNotReached() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/NameCountForStarNotReached.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/NameCountForStarNotReached.kt");
     }
 
     @TestMetadata("NameCountForStarReached.kt")
     public void testNameCountForStarReached() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/NameCountForStarReached.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/NameCountForStarReached.kt");
     }
 
     @TestMetadata("NoConflictingNameForInaccessibleClass1.kt")
     public void testNoConflictingNameForInaccessibleClass1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt");
     }
 
     @TestMetadata("NoConflictingNameForInaccessibleClass2.kt")
     public void testNoConflictingNameForInaccessibleClass2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/NoConflictingNameForInaccessibleClass2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/NoConflictingNameForInaccessibleClass2.kt");
     }
 
     @TestMetadata("NoNeedToImportStandardClass.kt")
     public void testNoNeedToImportStandardClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/NoNeedToImportStandardClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/NoNeedToImportStandardClass.kt");
     }
 
     @TestMetadata("PackageDoesNotConflictWithClass.kt")
     public void testPackageDoesNotConflictWithClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/PackageDoesNotConflictWithClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/PackageDoesNotConflictWithClass.kt");
     }
 
     @TestMetadata("PropertyAlreadyImported1.kt")
     public void testPropertyAlreadyImported1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/PropertyAlreadyImported1.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/PropertyAlreadyImported1.kt");
     }
 
     @TestMetadata("PropertyAlreadyImported2.kt")
     public void testPropertyAlreadyImported2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/PropertyAlreadyImported2.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/PropertyAlreadyImported2.kt");
     }
 
     @TestMetadata("StdlibImportsLast.kt")
     public void testStdlibImportsLast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/addImport/StdlibImportsLast.kt");
-        doTest(fileName);
+        runTest("idea/testData/addImport/StdlibImportsLast.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java

@@ -21,175 +21,151 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaAgainstKotlinBinariesCheckerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AssignKotlinClassToObjectInJava.kt")
     public void testAssignKotlinClassToObjectInJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
     }
 
     @TestMetadata("AssignMappedKotlinType.kt")
     public void testAssignMappedKotlinType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
     }
 
     @TestMetadata("ClassObjects.kt")
     public void testClassObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
     }
 
     @TestMetadata("EnumAutoGeneratedMethods.kt")
     public void testEnumAutoGeneratedMethods() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
     }
 
     @TestMetadata("EnumEntriesInSwitch.kt")
     public void testEnumEntriesInSwitch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
     }
 
     @TestMetadata("EnumStaticImportInJava.kt")
     public void testEnumStaticImportInJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
     }
 
     @TestMetadata("ExtendClassWithDefaultImplementationComplex.kt")
     public void testExtendClassWithDefaultImplementationComplex() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementationComplex.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementationComplex.kt");
     }
 
     @TestMetadata("ExtendClassWithDefaultImplementation_1_6.kt")
     public void testExtendClassWithDefaultImplementation_1_6() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_6.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_6.kt");
     }
 
     @TestMetadata("ExtendClassWithDefaultImplementation_1_8.kt")
     public void testExtendClassWithDefaultImplementation_1_8() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_8.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_8.kt");
     }
 
     @TestMetadata("ExtendingMutableInterfaces.kt")
     public void testExtendingMutableInterfaces() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingMutableInterfaces.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingMutableInterfaces.kt");
     }
 
     @TestMetadata("ExtendingReadOnlyInterfaces.kt")
     public void testExtendingReadOnlyInterfaces() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingReadOnlyInterfaces.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingReadOnlyInterfaces.kt");
     }
 
     @TestMetadata("FunctionInNestedClassInDataFlowInspection.kt")
     public void testFunctionInNestedClassInDataFlowInspection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
     }
 
     @TestMetadata("ImplementedMethodsFromTraits.kt")
     public void testImplementedMethodsFromTraits() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
     }
 
     @TestMetadata("InferenceReturnType_1_6.kt")
     public void testInferenceReturnType_1_6() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_6.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_6.kt");
     }
 
     @TestMetadata("InferenceReturnType_1_8.kt")
     public void testInferenceReturnType_1_8() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_8.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_8.kt");
     }
 
     @TestMetadata("InterfaceDefaultImpls.kt")
     public void testInterfaceDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceDefaultImpls.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceDefaultImpls.kt");
     }
 
     @TestMetadata("JvmOverloadsFunctions.kt")
     public void testJvmOverloadsFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
     }
 
     @TestMetadata("KotlinAnnotations.kt")
     public void testKotlinAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
     }
 
     @TestMetadata("ReturnInnerClasses.kt")
     public void testReturnInnerClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
     }
 
     @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
     public void testTopLevelFunctionInDataFlowInspection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
     }
 
     @TestMetadata("TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt")
     public void testTopLevelFunctionWithNameSimilarToClassInDataFlowInspection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt");
     }
 
     @TestMetadata("TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt")
     public void testTopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt");
     }
 
     @TestMetadata("TopLevelOverloadedFunctionInDataFlowInspection.kt")
     public void testTopLevelOverloadedFunctionInDataFlowInspection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelOverloadedFunctionInDataFlowInspection.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelOverloadedFunctionInDataFlowInspection.kt");
     }
 
     @TestMetadata("UseKotlinConstInSwitch.kt")
     public void testUseKotlinConstInSwitch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinConstInSwitch.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinConstInSwitch.kt");
     }
 
     @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
     public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
     }
 
     @TestMetadata("UsingKotlinPackageDeclarations.kt")
     public void testUsingKotlinPackageDeclarations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
     }
 
     @TestMetadata("UsingMutableInterfaces.kt")
     public void testUsingMutableInterfaces() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingMutableInterfaces.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingMutableInterfaces.kt");
     }
 
     @TestMetadata("UsingReadOnlyInterfaces.kt")
     public void testUsingReadOnlyInterfaces() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingReadOnlyInterfaces.kt");
-        doTest(fileName);
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingReadOnlyInterfaces.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java

@@ -23,176 +23,152 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaAgainstKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("AssignKotlinClassToObjectInJava.kt")
         public void testAssignKotlinClassToObjectInJava() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
         }
 
         @TestMetadata("AssignMappedKotlinType.kt")
         public void testAssignMappedKotlinType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
         }
 
         @TestMetadata("ClassObjects.kt")
         public void testClassObjects() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
         }
 
         @TestMetadata("EnumAutoGeneratedMethods.kt")
         public void testEnumAutoGeneratedMethods() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
         }
 
         @TestMetadata("EnumEntriesInSwitch.kt")
         public void testEnumEntriesInSwitch() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
         }
 
         @TestMetadata("EnumStaticImportInJava.kt")
         public void testEnumStaticImportInJava() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
         }
 
         @TestMetadata("ExtendClassWithDefaultImplementationComplex.kt")
         public void testExtendClassWithDefaultImplementationComplex() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementationComplex.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementationComplex.kt");
         }
 
         @TestMetadata("ExtendClassWithDefaultImplementation_1_6.kt")
         public void testExtendClassWithDefaultImplementation_1_6() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_6.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_6.kt");
         }
 
         @TestMetadata("ExtendClassWithDefaultImplementation_1_8.kt")
         public void testExtendClassWithDefaultImplementation_1_8() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_8.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_8.kt");
         }
 
         @TestMetadata("ExtendingMutableInterfaces.kt")
         public void testExtendingMutableInterfaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingMutableInterfaces.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingMutableInterfaces.kt");
         }
 
         @TestMetadata("ExtendingReadOnlyInterfaces.kt")
         public void testExtendingReadOnlyInterfaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingReadOnlyInterfaces.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingReadOnlyInterfaces.kt");
         }
 
         @TestMetadata("FunctionInNestedClassInDataFlowInspection.kt")
         public void testFunctionInNestedClassInDataFlowInspection() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
         }
 
         @TestMetadata("ImplementedMethodsFromTraits.kt")
         public void testImplementedMethodsFromTraits() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
         }
 
         @TestMetadata("InferenceReturnType_1_6.kt")
         public void testInferenceReturnType_1_6() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_6.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_6.kt");
         }
 
         @TestMetadata("InferenceReturnType_1_8.kt")
         public void testInferenceReturnType_1_8() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_8.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_8.kt");
         }
 
         @TestMetadata("InterfaceDefaultImpls.kt")
         public void testInterfaceDefaultImpls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceDefaultImpls.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceDefaultImpls.kt");
         }
 
         @TestMetadata("JvmOverloadsFunctions.kt")
         public void testJvmOverloadsFunctions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
         }
 
         @TestMetadata("KotlinAnnotations.kt")
         public void testKotlinAnnotations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
         }
 
         @TestMetadata("ReturnInnerClasses.kt")
         public void testReturnInnerClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
         }
 
         @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
         public void testTopLevelFunctionInDataFlowInspection() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
         }
 
         @TestMetadata("TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt")
         public void testTopLevelFunctionWithNameSimilarToClassInDataFlowInspection() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt");
         }
 
         @TestMetadata("TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt")
         public void testTopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt");
         }
 
         @TestMetadata("TopLevelOverloadedFunctionInDataFlowInspection.kt")
         public void testTopLevelOverloadedFunctionInDataFlowInspection() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelOverloadedFunctionInDataFlowInspection.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelOverloadedFunctionInDataFlowInspection.kt");
         }
 
         @TestMetadata("UseKotlinConstInSwitch.kt")
         public void testUseKotlinConstInSwitch() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinConstInSwitch.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinConstInSwitch.kt");
         }
 
         @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
         public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
         }
 
         @TestMetadata("UsingKotlinPackageDeclarations.kt")
         public void testUsingKotlinPackageDeclarations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
         }
 
         @TestMetadata("UsingMutableInterfaces.kt")
         public void testUsingMutableInterfaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingMutableInterfaces.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingMutableInterfaces.kt");
         }
 
         @TestMetadata("UsingReadOnlyInterfaces.kt")
         public void testUsingReadOnlyInterfaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingReadOnlyInterfaces.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingReadOnlyInterfaces.kt");
         }
     }
 
@@ -200,26 +176,27 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaWithKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJavaWithKotlin() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("InnerClassWithoutName.kt")
         public void testInnerClassWithoutName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/InnerClassWithoutName.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/InnerClassWithoutName.kt");
         }
 
         @TestMetadata("JvmPackageNameFileFacade.kt")
         public void testJvmPackageNameFileFacade() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt");
         }
 
         @TestMetadata("NoNotNullOnParameterInOverride.kt")
         public void testNoNotNullOnParameterInOverride() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
-            doTest(fileName);
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java

@@ -21,25 +21,26 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JsCheckerTestGenerated extends AbstractJsCheckerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInJs() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("basic.kt")
     public void testBasic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt");
-        doTest(fileName);
+        runTest("idea/testData/checker/js/basic.kt");
     }
 
     @TestMetadata("dynamic.kt")
     public void testDynamic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/dynamic.kt");
-        doTest(fileName);
+        runTest("idea/testData/checker/js/dynamic.kt");
     }
 
     @TestMetadata("helloWorld.kt")
     public void testHelloWorld() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt");
-        doTest(fileName);
+        runTest("idea/testData/checker/js/helloWorld.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFindUsagesWithLibraryTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLibraryUsages() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,44 +33,42 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaLibrary extends AbstractKotlinFindUsagesWithLibraryTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJavaLibrary() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("LibraryClassUsages.0.kt")
         public void testLibraryClassUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt");
         }
 
         @TestMetadata("LibraryConstructorUsages.0.kt")
         public void testLibraryConstructorUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt");
         }
 
         @TestMetadata("LibraryFieldUsages.0.kt")
         public void testLibraryFieldUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt");
         }
 
         @TestMetadata("LibraryMethodUsages.0.kt")
         public void testLibraryMethodUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt");
         }
 
         @TestMetadata("LibraryStaticFieldUsages.0.kt")
         public void testLibraryStaticFieldUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt");
         }
 
         @TestMetadata("LibraryStaticMethodUsages.0.kt")
         public void testLibraryStaticMethodUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt");
         }
     }
 
@@ -74,80 +76,72 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class KotlinLibrary extends AbstractKotlinFindUsagesWithLibraryTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInKotlinLibrary() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("LibraryClassUsages.0.kt")
         public void testLibraryClassUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt");
         }
 
         @TestMetadata("LibraryCompanionObjectUsages.0.kt")
         public void testLibraryCompanionObjectUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt");
         }
 
         @TestMetadata("LibraryEnumEntryUsages.0.kt")
         public void testLibraryEnumEntryUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt");
         }
 
         @TestMetadata("LibraryFunctionUsages.0.kt")
         public void testLibraryFunctionUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt");
         }
 
         @TestMetadata("LibraryMemberFunctionUsages.0.kt")
         public void testLibraryMemberFunctionUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt");
         }
 
         @TestMetadata("LibraryNestedClassMemberFunctionUsages.0.kt")
         public void testLibraryNestedClassMemberFunctionUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt");
         }
 
         @TestMetadata("LibraryNestedClassPrimaryConstructorUsages.0.kt")
         public void testLibraryNestedClassPrimaryConstructorUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt");
         }
 
         @TestMetadata("LibraryNestedClassSecondaryConstructorUsages.0.kt")
         public void testLibraryNestedClassSecondaryConstructorUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt");
         }
 
         @TestMetadata("LibraryNestedClassUsages.0.kt")
         public void testLibraryNestedClassUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt");
         }
 
         @TestMetadata("LibraryObjectUsages.0.kt")
         public void testLibraryObjectUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt");
         }
 
         @TestMetadata("LibraryPrimaryConstructorUsages.0.kt")
         public void testLibraryPrimaryConstructorUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt");
         }
 
         @TestMetadata("LibrarySecondaryConstructorUsages.0.kt")
         public void testLibrarySecondaryConstructorUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt");
-            doTest(fileName);
+            runTest("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt");
         }
     }
 
@@ -155,8 +149,25 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class _library extends AbstractKotlinFindUsagesWithLibraryTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentIn_library() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true);
         }
+
+        @TestMetadata("idea/testData/findUsages/libraryUsages/_library/library")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Library extends AbstractKotlinFindUsagesWithLibraryTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInLibrary() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library/library"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true);
+            }
+        }
     }
 }

idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java

@@ -23,34 +23,33 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DirectSettings extends AbstractTypingIndentationTestBase {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doNewlineTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("AfterCatch.after.kt")
         public void testAfterCatch() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterCatch.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AfterCatch.after.kt");
         }
 
         @TestMetadata("AfterClassNameBeforeFun.after.kt")
         public void testAfterClassNameBeforeFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
         }
 
         @TestMetadata("AfterFinally.after.kt")
         public void testAfterFinally() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterFinally.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AfterFinally.after.kt");
         }
 
         @TestMetadata("AfterImport.after.kt")
         public void testAfterImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterImport.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AfterImport.after.kt");
         }
 
         @TestMetadata("AfterTry.after.kt")
         public void testAfterTry() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterTry.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AfterTry.after.kt");
         }
 
         public void testAllFilesPresentInDirectSettings() throws Exception {
@@ -59,298 +58,254 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("Annotation.after.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/Annotation.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/Annotation.after.kt");
         }
 
         @TestMetadata("ArgumentListNormalIndent.after.kt")
         public void testArgumentListNormalIndent() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt");
         }
 
         @TestMetadata("AssignmentAfterEq.after.kt")
         public void testAssignmentAfterEq() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt");
         }
 
         @TestMetadata("BinaryWithTypeExpressions.after.kt")
         public void testBinaryWithTypeExpressions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt");
         }
 
         @TestMetadata("ConsecutiveCallsAfterDot.after.kt")
         public void testConsecutiveCallsAfterDot() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
         }
 
         @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt")
         public void testConsecutiveCallsInSaeCallsMiddle() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
         }
 
         @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt")
         public void testConsecutiveCallsInSafeCallsEnd() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
         }
 
         @TestMetadata("DoInFun.after.kt")
         public void testDoInFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/DoInFun.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/DoInFun.after.kt");
         }
 
         @TestMetadata("EmptyParameters.after.kt")
         public void testEmptyParameters() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/EmptyParameters.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/EmptyParameters.after.kt");
         }
 
         @TestMetadata("For.after.kt")
         public void testFor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/For.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/For.after.kt");
         }
 
         @TestMetadata("FunctionBlock.after.kt")
         public void testFunctionBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/FunctionBlock.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/FunctionBlock.after.kt");
         }
 
         @TestMetadata("FunctionWithInference.after.kt")
         public void testFunctionWithInference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/FunctionWithInference.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/FunctionWithInference.after.kt");
         }
 
         @TestMetadata("If.after.kt")
         public void testIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/If.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/If.after.kt");
         }
 
         @TestMetadata("InBinaryExpressionInMiddle.after.kt")
         public void testInBinaryExpressionInMiddle() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt");
         }
 
         @TestMetadata("InBinaryExpressionUnfinished.after.kt")
         public void testInBinaryExpressionUnfinished() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt");
         }
 
         @TestMetadata("InBinaryExpressionUnfinishedInIf.after.kt")
         public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt");
         }
 
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
         }
 
         @TestMetadata("InDelegationListAfterColon.after.kt")
         public void testInDelegationListAfterColon() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
         }
 
         @TestMetadata("InDelegationListAfterComma.after.kt")
         public void testInDelegationListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
         }
 
         @TestMetadata("InDelegationListNotEmpty.after.kt")
         public void testInDelegationListNotEmpty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
         }
 
         @TestMetadata("InEnumAfterSemicolon.after.kt")
         public void testInEnumAfterSemicolon() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt");
         }
 
         @TestMetadata("InEnumInitializerListAfterComma.after.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
         }
 
         @TestMetadata("InEnumInitializerListNotEmpty.after.kt")
         public void testInEnumInitializerListNotEmpty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
         }
 
         @TestMetadata("InExpressionsParentheses.after.kt")
         public void testInExpressionsParentheses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt");
         }
 
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
         }
 
         @TestMetadata("InLabmdaAfterArrow.after.kt")
         public void testInLabmdaAfterArrow() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
         }
 
         @TestMetadata("InLambdaAfterArrowWithSpaces.after.kt")
         public void testInLambdaAfterArrowWithSpaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
         }
 
         @TestMetadata("InLambdaBeforeParams.after.kt")
         public void testInLambdaBeforeParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
         }
 
         @TestMetadata("InLambdaInsideChainCallSameLine.after.kt")
         public void testInLambdaInsideChainCallSameLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
         }
 
         @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
         }
 
         @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt")
         public void testInLambdaInsideChainCallWithNewLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
         }
 
         @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
         }
 
         @TestMetadata("InMultilineLambdaAfterArrow.after.kt")
         public void testInMultilineLambdaAfterArrow() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
         }
 
         @TestMetadata("IsExpressionAfterIs.after.kt")
         public void testIsExpressionAfterIs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt");
         }
 
         @TestMetadata("KT20783.after.kt")
         public void testKT20783() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/KT20783.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/KT20783.after.kt");
         }
 
         @TestMetadata("MultideclarationAfterEq.after.kt")
         public void testMultideclarationAfterEq() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt");
         }
 
         @TestMetadata("MultideclarationBeforeEq.after.kt")
         public void testMultideclarationBeforeEq() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt");
         }
 
         @TestMetadata("NotFirstParameter.after.kt")
         public void testNotFirstParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/NotFirstParameter.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/NotFirstParameter.after.kt");
         }
 
         @TestMetadata("PropertyWithInference.after.kt")
         public void testPropertyWithInference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/PropertyWithInference.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/PropertyWithInference.after.kt");
         }
 
         @TestMetadata("ReturnContinue.after.kt")
         public void testReturnContinue() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ReturnContinue.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/ReturnContinue.after.kt");
         }
 
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
         }
 
         @TestMetadata("While.after.kt")
         public void testWhile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/While.after.kt");
-            doNewlineTest(fileName);
+            runTest("idea/testData/indentationOnNewline/While.after.kt");
         }
 
         @TestMetadata("idea/testData/indentationOnNewline/script")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Script extends AbstractTypingIndentationTestBase {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doNewlineTest, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInScript() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline/script"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), TargetBackend.ANY, true);
             }
 
             @TestMetadata("ScriptAfterClosingBrace.after.kts")
             public void testScriptAfterClosingBrace() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts");
             }
 
             @TestMetadata("ScriptAfterExpression.after.kts")
             public void testScriptAfterExpression() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
             }
 
             @TestMetadata("ScriptAfterFun.after.kts")
             public void testScriptAfterFun() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
             }
 
             @TestMetadata("ScriptAfterImport.after.kts")
             public void testScriptAfterImport() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
             }
 
             @TestMetadata("ScriptBetweenFunctionCalls.after.kts")
             public void testScriptBetweenFunctionCalls() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts");
             }
 
             @TestMetadata("ScriptInsideFun.after.kts")
             public void testScriptInsideFun() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
-                doNewlineTest(fileName);
+                runTest("idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
             }
         }
     }
@@ -359,104 +314,105 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InvertedSettings extends AbstractTypingIndentationTestBase {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doNewlineTestWithInvert, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInInvertedSettings() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("AssignmentAfterEq.after.inv.kt")
         public void testAssignmentAfterEq() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt");
         }
 
         @TestMetadata("BinaryWithTypeExpressions.after.inv.kt")
         public void testBinaryWithTypeExpressions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt");
         }
 
         @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt")
         public void testInBinaryExpressionInMiddle() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
         }
 
         @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt")
         public void testInBinaryExpressionUnfinished() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
         }
 
         @TestMetadata("InBinaryExpressionUnfinishedInIf.after.inv.kt")
         public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt");
         }
 
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
         }
 
         @TestMetadata("InDelegationListAfterColon.after.inv.kt")
         public void testInDelegationListAfterColon() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
         }
 
         @TestMetadata("InDelegationListAfterComma.after.inv.kt")
         public void testInDelegationListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
         }
 
         @TestMetadata("InDelegationListNotEmpty.after.inv.kt")
         public void testInDelegationListNotEmpty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
         }
 
         @TestMetadata("InEnumAfterSemicolon.after.inv.kt")
         public void testInEnumAfterSemicolon() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt");
         }
 
         @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
         }
 
         @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt")
         public void testInEnumInitializerListNotEmpty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
         }
 
         @TestMetadata("InExpressionsParentheses.after.inv.kt")
         public void testInExpressionsParentheses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt");
         }
 
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
         }
 
         @TestMetadata("IsExpressionAfterIs.after.inv.kt")
         public void testIsExpressionAfterIs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt");
         }
 
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
-            doNewlineTestWithInvert(fileName);
+            runTest("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+        }
+
+        @TestMetadata("idea/testData/indentationOnNewline/script")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Script extends AbstractTypingIndentationTestBase {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doNewlineTestWithInvert, TargetBackend.ANY, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInScript() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline/script"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), TargetBackend.ANY, true);
+            }
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java

@@ -21,31 +21,31 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTestExpressionSelection, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInExpressionSelection() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("binaryExpr.kt")
     public void testBinaryExpr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt");
-        doTestExpressionSelection(fileName);
+        runTest("idea/testData/expressionSelection/binaryExpr.kt");
     }
 
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt");
-        doTestExpressionSelection(fileName);
+        runTest("idea/testData/expressionSelection/labelledStatement.kt");
     }
 
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt");
-        doTestExpressionSelection(fileName);
+        runTest("idea/testData/expressionSelection/labelledThis.kt");
     }
 
     @TestMetadata("noExpression.kt")
     public void testNoExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt");
-        doTestExpressionSelection(fileName);
+        runTest("idea/testData/expressionSelection/noExpression.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/KotlinTypeAliasByExpansionShortNameIndexTestGenerated.java

@@ -21,25 +21,26 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinTypeAliasByExpansionShortNameIndexTestGenerated extends AbstractKotlinTypeAliasByExpansionShortNameIndexTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInTypealiasExpansionIndex() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typealiasExpansionIndex"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("functionalTypes.kt")
     public void testFunctionalTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typealiasExpansionIndex/functionalTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/typealiasExpansionIndex/functionalTypes.kt");
     }
 
     @TestMetadata("generics.kt")
     public void testGenerics() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typealiasExpansionIndex/generics.kt");
-        doTest(fileName);
+        runTest("idea/testData/typealiasExpansionIndex/generics.kt");
     }
 
     @TestMetadata("simpleType.kt")
     public void testSimpleType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typealiasExpansionIndex/simpleType.kt");
-        doTest(fileName);
+        runTest("idea/testData/typealiasExpansionIndex/simpleType.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java

@@ -21,97 +21,86 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTestSmartSelection, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInSmartSelection() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("commentsAndExtraSpaces.kt")
     public void testCommentsAndExtraSpaces() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/commentsAndExtraSpaces.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/commentsAndExtraSpaces.kt");
     }
 
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/labelledStatement.kt");
     }
 
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/labelledThis.kt");
     }
 
     @TestMetadata("lambdaCalls.kt")
     public void testLambdaCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/lambdaCalls.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/lambdaCalls.kt");
     }
 
     @TestMetadata("multilineCalls.kt")
     public void testMultilineCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/multilineCalls.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/multilineCalls.kt");
     }
 
     @TestMetadata("multilineOperations.kt")
     public void testMultilineOperations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/multilineOperations.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/multilineOperations.kt");
     }
 
     @TestMetadata("objectLiteral.kt")
     public void testObjectLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/objectLiteral.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/objectLiteral.kt");
     }
 
     @TestMetadata("parenthesized.kt")
     public void testParenthesized() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/parenthesized.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/parenthesized.kt");
     }
 
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/simple.kt");
     }
 
     @TestMetadata("superExpression.kt")
     public void testSuperExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/superExpression.kt");
     }
 
     @TestMetadata("superExpressionWithLabel.kt")
     public void testSuperExpressionWithLabel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/superExpressionWithLabel.kt");
     }
 
     @TestMetadata("superExpressionWithLabelAndType.kt")
     public void testSuperExpressionWithLabelAndType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
     }
 
     @TestMetadata("superExpressionWithType.kt")
     public void testSuperExpressionWithType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/superExpressionWithType.kt");
     }
 
     @TestMetadata("typeInSuperExpression.kt")
     public void testTypeInSuperExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/typeInSuperExpression.kt");
     }
 
     @TestMetadata("typeInSuperExpressionWithLabel.kt")
     public void testTypeInSuperExpressionWithLabel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
-        doTestSmartSelection(fileName);
+        runTest("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java

@@ -21,55 +21,51 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class GotoTestOrCodeActionTestGenerated extends AbstractGotoTestOrCodeActionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInGotoTestOrCode() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoTestOrCode"), Pattern.compile("^(.+)\\.main\\..+$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("fromJavaClassToTest.main.java")
     public void testFromJavaClassToTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java");
     }
 
     @TestMetadata("fromJavaTestToKotlinClass.main.java")
     public void testFromJavaTestToKotlinClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java");
     }
 
     @TestMetadata("fromJavaTestToKotlinFile.main.java")
     public void testFromJavaTestToKotlinFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinFile.main.java");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinFile.main.java");
     }
 
     @TestMetadata("fromKotlinClassToTest.main.kt")
     public void testFromKotlinClassToTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt");
     }
 
     @TestMetadata("fromKotlinFileToTest.main.kt")
     public void testFromKotlinFileToTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinFileToTest.main.kt");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromKotlinFileToTest.main.kt");
     }
 
     @TestMetadata("fromKotlinTestToJavaClass.main.kt")
     public void testFromKotlinTestToJavaClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt");
     }
 
     @TestMetadata("fromKotlinTestToKotlinClass.main.kt")
     public void testFromKotlinTestToKotlinClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt");
     }
 
     @TestMetadata("fromKotlinTestToKotlinFile.main.kt")
     public void testFromKotlinTestToKotlinFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinFile.main.kt");
-        doTest(fileName);
+        runTest("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinFile.main.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java

@@ -21,148 +21,134 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLightClassTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLightClasses() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true, "local", "compilationErrors", "ideRegression");
     }
 
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
     }
 
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
     }
 
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/Delegation.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
     }
 
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DollarsInName.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
     }
 
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
     }
 
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
     }
 
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/JvmStatic.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
     }
 
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/NestedObjects.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
     }
 
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/PublishedApi.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
     }
 
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
     }
 
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/VarArgs.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
     }
 
     @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Delegation extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInDelegation() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Function.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
         }
     }
 
@@ -170,32 +156,32 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Facades extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInFacades() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
         }
 
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
         }
 
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
         }
 
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
@@ -203,116 +189,102 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NullabilityAnnotations extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
@@ -320,14 +292,17 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Object extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInObject() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
         }
     }
 
@@ -335,20 +310,22 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PublicField extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInPublicField() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
         }
     }
 
@@ -356,20 +333,22 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Script extends AbstractIdeCompiledLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInScript() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("HelloWorld.kts")
         public void testHelloWorld() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/HelloWorld.kts");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/script/HelloWorld.kts");
         }
 
         @TestMetadata("InnerClasses.kts")
         public void testInnerClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/InnerClasses.kts");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/script/InnerClasses.kts");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java

@@ -21,150 +21,135 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLightClasses() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true, "delegation");
     }
 
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
     }
 
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
     }
 
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/Delegation.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
     }
 
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DollarsInName.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
     }
 
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
     }
 
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
     }
 
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/JvmStatic.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
     }
 
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/NestedObjects.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
     }
 
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/PublishedApi.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
     }
 
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
     }
 
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/VarArgs.kt");
-        doTest(fileName);
+        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
     }
 
     @TestMetadata("compiler/testData/asJava/lightClasses/compilationErrors")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CompilationErrors extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("ActualClass.kt")
         public void testActualClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
         }
 
         @TestMetadata("ActualTypeAlias.kt")
         public void testActualTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
         }
 
         @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
         public void testActualTypeAliasCustomJvmPackageName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
         }
 
         public void testAllFilesPresentInCompilationErrors() throws Exception {
@@ -173,80 +158,67 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
 
         @TestMetadata("AllInlineOnly.kt")
         public void testAllInlineOnly() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
         }
 
         @TestMetadata("AnnotationModifiers.kt")
         public void testAnnotationModifiers() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
         }
 
         @TestMetadata("ExpectClass.kt")
         public void testExpectClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
         }
 
         @TestMetadata("ExpectObject.kt")
         public void testExpectObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
         }
 
         @TestMetadata("ExpectedNestedClass.kt")
         public void testExpectedNestedClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
         }
 
         @TestMetadata("ExpectedNestedClassInObject.kt")
         public void testExpectedNestedClassInObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
         }
 
         @TestMetadata("JvmPackageName.kt")
         public void testJvmPackageName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
         }
 
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
         }
 
         @TestMetadata("RepetableAnnotations.kt")
         public void testRepetableAnnotations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
         }
 
         @TestMetadata("SameName.kt")
         public void testSameName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
         }
 
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
         }
 
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
         }
 
         @TestMetadata("WrongAnnotations.kt")
         public void testWrongAnnotations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
         }
     }
 
@@ -254,32 +226,32 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Facades extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInFacades() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
         }
 
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
         }
 
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
         }
 
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
@@ -287,56 +259,52 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class IdeRegression extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIdeRegression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("AllOpenAnnotatedClasses.kt")
         public void testAllOpenAnnotatedClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
         }
 
         @TestMetadata("ImplementingCharSequenceAndNumber.kt")
         public void testImplementingCharSequenceAndNumber() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
         }
 
         @TestMetadata("ImplementingMap.kt")
         public void testImplementingMap() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
         }
 
         @TestMetadata("ImplementingMutableSet.kt")
         public void testImplementingMutableSet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
         }
 
         @TestMetadata("InheritingInterfaceDefaultImpls.kt")
         public void testInheritingInterfaceDefaultImpls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
         }
 
         @TestMetadata("OverridingFinalInternal.kt")
         public void testOverridingFinalInternal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
         }
 
         @TestMetadata("OverridingInternal.kt")
         public void testOverridingInternal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
         }
 
         @TestMetadata("OverridingProtected.kt")
         public void testOverridingProtected() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
         }
     }
 
@@ -344,14 +312,17 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Local extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInLocal() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/local"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("DollarsInNameLocal.kt")
         public void testDollarsInNameLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/local/DollarsInNameLocal.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/local/DollarsInNameLocal.kt");
         }
     }
 
@@ -359,116 +330,102 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NullabilityAnnotations extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
@@ -476,14 +433,17 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Object extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInObject() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
         }
     }
 
@@ -491,20 +451,22 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PublicField extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInPublicField() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
         }
     }
 
@@ -512,20 +474,22 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Script extends AbstractIdeLightClassTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInScript() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("HelloWorld.kts")
         public void testHelloWorld() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/HelloWorld.kts");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/script/HelloWorld.kts");
         }
 
         @TestMetadata("InnerClasses.kts")
         public void testInnerClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/script/InnerClasses.kts");
-            doTest(fileName);
+            runTest("compiler/testData/asJava/lightClasses/script/InnerClasses.kts");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiModuleLineMarkerTestGenerated extends AbstractMultiModuleLineMarkerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("actualEnumEntries")
     public void testActualEnumEntries() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/actualEnumEntries/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/actualEnumEntries/");
     }
 
     public void testAllFilesPresentInMultiModuleLineMarker() throws Exception {
@@ -33,145 +36,121 @@ public class MultiModuleLineMarkerTestGenerated extends AbstractMultiModuleLineM
 
     @TestMetadata("expectEnumEntries")
     public void testExpectEnumEntries() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/expectEnumEntries/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/expectEnumEntries/");
     }
 
     @TestMetadata("fromActualAnnotation")
     public void testFromActualAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromActualAnnotation/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromActualAnnotation/");
     }
 
     @TestMetadata("fromActualPrimaryConstructor")
     public void testFromActualPrimaryConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/");
     }
 
     @TestMetadata("fromActualSealedClass")
     public void testFromActualSealedClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromActualSealedClass/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromActualSealedClass/");
     }
 
     @TestMetadata("fromActualSecondaryConstructor")
     public void testFromActualSecondaryConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/");
     }
 
     @TestMetadata("fromActualTypeAlias")
     public void testFromActualTypeAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromActualTypeAlias/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromActualTypeAlias/");
     }
 
     @TestMetadata("fromClassToAlias")
     public void testFromClassToAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromClassToAlias/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromClassToAlias/");
     }
 
     @TestMetadata("fromClassToJavaAliasInTest")
     public void testFromClassToJavaAliasInTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/");
     }
 
     @TestMetadata("fromCommonToJvmHeader")
     public void testFromCommonToJvmHeader() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/");
     }
 
     @TestMetadata("fromCommonToJvmImpl")
     public void testFromCommonToJvmImpl() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/");
     }
 
     @TestMetadata("fromExpectedAnnotation")
     public void testFromExpectedAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromExpectedAnnotation/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromExpectedAnnotation/");
     }
 
     @TestMetadata("fromExpectedPrimaryConstructor")
     public void testFromExpectedPrimaryConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/");
     }
 
     @TestMetadata("fromExpectedSealedClass")
     public void testFromExpectedSealedClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromExpectedSealedClass/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromExpectedSealedClass/");
     }
 
     @TestMetadata("fromExpectedSecondaryConstructor")
     public void testFromExpectedSecondaryConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/");
     }
 
     @TestMetadata("fromExpectedTypeAlias")
     public void testFromExpectedTypeAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/");
     }
 
     @TestMetadata("hierarchyWithExpectClassCommonSide")
     public void testHierarchyWithExpectClassCommonSide() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/");
     }
 
     @TestMetadata("hierarchyWithExpectClassCommonSideNonJavaIds")
     public void testHierarchyWithExpectClassCommonSideNonJavaIds() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/");
     }
 
     @TestMetadata("hierarchyWithExpectClassPlatformSide")
     public void testHierarchyWithExpectClassPlatformSide() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/");
     }
 
     @TestMetadata("kotlinTestAnnotations")
     public void testKotlinTestAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/kotlinTestAnnotations/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/kotlinTestAnnotations/");
     }
 
     @TestMetadata("suspendImplInPlatformModules")
     public void testSuspendImplInPlatformModules() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/");
     }
 
     @TestMetadata("topLevelFunWithKotlinTest")
     public void testTopLevelFunWithKotlinTest() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/");
     }
 
     @TestMetadata("transitive")
     public void testTransitive() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/transitive/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/transitive/");
     }
 
     @TestMetadata("transitiveCommon")
     public void testTransitiveCommon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/transitiveCommon/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/transitiveCommon/");
     }
 
     @TestMetadata("withOverloads")
     public void testWithOverloads() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiModuleLineMarker/withOverloads/");
-        doTest(fileName);
+        runTest("idea/testData/multiModuleLineMarker/withOverloads/");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsTestGenerated.java

@@ -21,91 +21,81 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class BreadcrumbsTestGenerated extends AbstractBreadcrumbsTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInBreadcrumbs() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/breadcrumbs"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AnonymousObjects.kt")
     public void testAnonymousObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/AnonymousObjects.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/AnonymousObjects.kt");
     }
 
     @TestMetadata("Declarations.kt")
     public void testDeclarations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/Declarations.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/Declarations.kt");
     }
 
     @TestMetadata("For.kt")
     public void testFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/For.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/For.kt");
     }
 
     @TestMetadata("FunctionalType.kt")
     public void testFunctionalType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/FunctionalType.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/FunctionalType.kt");
     }
 
     @TestMetadata("If.kt")
     public void testIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/If.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/If.kt");
     }
 
     @TestMetadata("LabeledStatements.kt")
     public void testLabeledStatements() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/LabeledStatements.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/LabeledStatements.kt");
     }
 
     @TestMetadata("Lambdas.kt")
     public void testLambdas() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/Lambdas.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/Lambdas.kt");
     }
 
     @TestMetadata("OnIfCondition.kt")
     public void testOnIfCondition() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/OnIfCondition.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/OnIfCondition.kt");
     }
 
     @TestMetadata("OnWhenEntryCondition.kt")
     public void testOnWhenEntryCondition() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/OnWhenEntryCondition.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/OnWhenEntryCondition.kt");
     }
 
     @TestMetadata("PropertyAccessor.kt")
     public void testPropertyAccessor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/PropertyAccessor.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/PropertyAccessor.kt");
     }
 
     @TestMetadata("StarProjection.kt")
     public void testStarProjection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/StarProjection.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/StarProjection.kt");
     }
 
     @TestMetadata("Try.kt")
     public void testTry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/Try.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/Try.kt");
     }
 
     @TestMetadata("When.kt")
     public void testWhen() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/When.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/When.kt");
     }
 
     @TestMetadata("While.kt")
     public void testWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/breadcrumbs/While.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/breadcrumbs/While.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/ExpressionTypeTestGenerated.java

@@ -21,109 +21,96 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ExpressionTypeTestGenerated extends AbstractExpressionTypeTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInExpressionType() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/expressionType"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AnonymousObject.kt")
     public void testAnonymousObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/AnonymousObject.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/AnonymousObject.kt");
     }
 
     @TestMetadata("BlockBodyFunction.kt")
     public void testBlockBodyFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/BlockBodyFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/BlockBodyFunction.kt");
     }
 
     @TestMetadata("IfAsExpression.kt")
     public void testIfAsExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/IfAsExpression.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/IfAsExpression.kt");
     }
 
     @TestMetadata("IfAsExpressionInsideBlock.kt")
     public void testIfAsExpressionInsideBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/IfAsExpressionInsideBlock.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/IfAsExpressionInsideBlock.kt");
     }
 
     @TestMetadata("Kt11601.kt")
     public void testKt11601() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/Kt11601.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/Kt11601.kt");
     }
 
     @TestMetadata("Lambda.kt")
     public void testLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/Lambda.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/Lambda.kt");
     }
 
     @TestMetadata("MethodName.kt")
     public void testMethodName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/MethodName.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/MethodName.kt");
     }
 
     @TestMetadata("MethodReference.kt")
     public void testMethodReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/MethodReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/MethodReference.kt");
     }
 
     @TestMetadata("MultiDeclaration.kt")
     public void testMultiDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/MultiDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/MultiDeclaration.kt");
     }
 
     @TestMetadata("MultiDeclarationInLambda.kt")
     public void testMultiDeclarationInLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/MultiDeclarationInLambda.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/MultiDeclarationInLambda.kt");
     }
 
     @TestMetadata("MultiDeclarationInLoop.kt")
     public void testMultiDeclarationInLoop() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/MultiDeclarationInLoop.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/MultiDeclarationInLoop.kt");
     }
 
     @TestMetadata("PropertyAccessor.kt")
     public void testPropertyAccessor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/PropertyAccessor.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/PropertyAccessor.kt");
     }
 
     @TestMetadata("SmartCast.kt")
     public void testSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/SmartCast.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/SmartCast.kt");
     }
 
     @TestMetadata("SoftSmartCast.kt")
     public void testSoftSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/SoftSmartCast.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/SoftSmartCast.kt");
     }
 
     @TestMetadata("SoftSmartCastMultipleTypes.kt")
     public void testSoftSmartCastMultipleTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/SoftSmartCastMultipleTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/SoftSmartCastMultipleTypes.kt");
     }
 
     @TestMetadata("ThisInLambda.kt")
     public void testThisInLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/ThisInLambda.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/ThisInLambda.kt");
     }
 
     @TestMetadata("VariableDeclaration.kt")
     public void testVariableDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/VariableDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/expressionType/VariableDeclaration.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java

@@ -23,368 +23,312 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Copy extends AbstractInsertImportOnPasteTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestCopy, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCopy() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("AlreadyImportedExtensions.kt")
         public void testAlreadyImportedExtensions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
         }
 
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
         }
 
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
         }
 
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassMember.kt");
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObject.kt");
         }
 
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
         }
 
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObjectInner.kt");
         }
 
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
         }
 
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassType.kt");
         }
 
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
         }
 
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ConflictWithClass.kt");
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Constructor.kt");
         }
 
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
         }
 
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DefaultPackage.kt");
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DelegatedProperty.kt");
         }
 
         @TestMetadata("DependenciesNotAccessibleOnPaste.kt")
         public void testDependenciesNotAccessibleOnPaste() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
         }
 
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnJava.kt");
         }
 
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
         }
 
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/EnumEntries.kt");
         }
 
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Extension.kt");
         }
 
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
         }
 
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
         }
 
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionConflict.kt");
         }
 
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ForLoop.kt");
         }
 
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/FullyQualified.kt");
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Function.kt");
         }
 
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
         }
 
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/FunctionParameter.kt");
         }
 
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/GetExpression.kt");
         }
 
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportDependency.kt");
         }
 
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportDirective.kt");
         }
 
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
         }
 
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
         }
 
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Inner.kt");
         }
 
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Invoke.kt");
         }
 
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
         }
 
         @TestMetadata("KT10433.kt")
         public void testKT10433() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/KT10433.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/KT10433.kt");
         }
 
         @TestMetadata("KeywordClassName.kt")
         public void testKeywordClassName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/KeywordClassName.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/KeywordClassName.kt");
         }
 
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Local.kt");
         }
 
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/MultiDeclaration.kt");
         }
 
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
         }
 
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
         }
 
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
         }
 
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/NotReferencePosition.kt");
         }
 
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
         }
 
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Object.kt");
         }
 
         @TestMetadata("OnlyKDocReferenced.kt")
         public void testOnlyKDocReferenced() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OnlyKDocReferenced.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/OnlyKDocReferenced.kt");
         }
 
         @TestMetadata("OverloadedExtensionFunction.kt")
         public void testOverloadedExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
         }
 
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/PackageView.kt");
         }
 
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/PartiallyQualified.kt");
         }
 
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
         }
 
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
         }
 
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Super.kt");
         }
 
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/ThisReference.kt");
         }
 
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/TopLevelProperty.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/Trait.kt");
         }
 
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
         }
 
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/TypeParameter.kt");
         }
 
         @TestMetadata("UnresolvedOverload.kt")
         public void testUnresolvedOverload() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/UnresolvedOverload.kt");
-            doTestCopy(fileName);
+            runTest("idea/testData/copyPaste/imports/UnresolvedOverload.kt");
         }
     }
 
@@ -392,368 +336,312 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Cut extends AbstractInsertImportOnPasteTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestCut, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCut() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("AlreadyImportedExtensions.kt")
         public void testAlreadyImportedExtensions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
         }
 
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
         }
 
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
         }
 
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassMember.kt");
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObject.kt");
         }
 
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
         }
 
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassObjectInner.kt");
         }
 
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
         }
 
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ClassType.kt");
         }
 
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
         }
 
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ConflictWithClass.kt");
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Constructor.kt");
         }
 
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
         }
 
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DefaultPackage.kt");
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DelegatedProperty.kt");
         }
 
         @TestMetadata("DependenciesNotAccessibleOnPaste.kt")
         public void testDependenciesNotAccessibleOnPaste() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
         }
 
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnJava.kt");
         }
 
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
         }
 
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/EnumEntries.kt");
         }
 
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Extension.kt");
         }
 
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
         }
 
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
         }
 
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ExtensionConflict.kt");
         }
 
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ForLoop.kt");
         }
 
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/FullyQualified.kt");
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Function.kt");
         }
 
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
         }
 
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/FunctionParameter.kt");
         }
 
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/GetExpression.kt");
         }
 
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportDependency.kt");
         }
 
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportDirective.kt");
         }
 
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
         }
 
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
         }
 
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Inner.kt");
         }
 
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Invoke.kt");
         }
 
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
         }
 
         @TestMetadata("KT10433.kt")
         public void testKT10433() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/KT10433.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/KT10433.kt");
         }
 
         @TestMetadata("KeywordClassName.kt")
         public void testKeywordClassName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/KeywordClassName.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/KeywordClassName.kt");
         }
 
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Local.kt");
         }
 
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/MultiDeclaration.kt");
         }
 
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
         }
 
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
         }
 
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
         }
 
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/NotReferencePosition.kt");
         }
 
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
         }
 
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Object.kt");
         }
 
         @TestMetadata("OnlyKDocReferenced.kt")
         public void testOnlyKDocReferenced() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OnlyKDocReferenced.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/OnlyKDocReferenced.kt");
         }
 
         @TestMetadata("OverloadedExtensionFunction.kt")
         public void testOverloadedExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
         }
 
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/PackageView.kt");
         }
 
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/PartiallyQualified.kt");
         }
 
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
         }
 
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
         }
 
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Super.kt");
         }
 
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/ThisReference.kt");
         }
 
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/TopLevelProperty.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/Trait.kt");
         }
 
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
         }
 
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/TypeParameter.kt");
         }
 
         @TestMetadata("UnresolvedOverload.kt")
         public void testUnresolvedOverload() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/UnresolvedOverload.kt");
-            doTestCut(fileName);
+            runTest("idea/testData/copyPaste/imports/UnresolvedOverload.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java

@@ -23,50 +23,47 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Intentions extends AbstractInspectionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIntentions() throws Exception {
             KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$"), TargetBackend.ANY);
         }
 
         @TestMetadata("branched/ifThenToElvis/inspectionData/inspections.test")
         public void testBranched_ifThenToElvis_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
         }
 
         @TestMetadata("convertToStringTemplate/inspectionData/inspections.test")
         public void testConvertToStringTemplate_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test");
         }
 
         @TestMetadata("destructuringInLambda/inspectionData/inspections.test")
         public void testDestructuringInLambda_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/destructuringInLambda/inspectionData/inspections.test");
         }
 
         @TestMetadata("iterationOverMap/inspectionData/inspections.test")
         public void testIterationOverMap_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/iterationOverMap/inspectionData/inspections.test");
         }
 
         @TestMetadata("objectLiteralToLambda/inspectionData/inspections.test")
         public void testObjectLiteralToLambda_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test");
         }
 
         @TestMetadata("removeExplicitSuperQualifier/inspectionData/inspections.test")
         public void testRemoveExplicitSuperQualifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test");
         }
 
         @TestMetadata("removeExplicitTypeArguments/inspectionData/inspections.test")
         public void testRemoveExplicitTypeArguments_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
         }
     }
 
@@ -74,10 +71,13 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Inspections extends AbstractInspectionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         @TestMetadata("addVarianceModifier/inspectionData/inspections.test")
         public void testAddVarianceModifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/addVarianceModifier/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/addVarianceModifier/inspectionData/inspections.test");
         }
 
         public void testAllFilesPresentInInspections() throws Exception {
@@ -86,404 +86,337 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
 
         @TestMetadata("allOpenSimple/inspectionData/inspections.test")
         public void testAllOpenSimple_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/allOpenSimple/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/allOpenSimple/inspectionData/inspections.test");
         }
 
         @TestMetadata("androidIllegalIdentifiers/inspectionData/inspections.test")
         public void testAndroidIllegalIdentifiers_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/androidIllegalIdentifiers/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/androidIllegalIdentifiers/inspectionData/inspections.test");
         }
 
         @TestMetadata("arrayInDataClass/inspectionData/inspections.test")
         public void testArrayInDataClass_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/arrayInDataClass/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/arrayInDataClass/inspectionData/inspections.test");
         }
 
         @TestMetadata("canBeParameter/inspectionData/inspections.test")
         public void testCanBeParameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/canBeParameter/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/canBeParameter/inspectionData/inspections.test");
         }
 
         @TestMetadata("canBePrimaryConstructorProperty/inspectionData/inspections.test")
         public void testCanBePrimaryConstructorProperty_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/canBePrimaryConstructorProperty/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/canBePrimaryConstructorProperty/inspectionData/inspections.test");
         }
 
         @TestMetadata("canBeVal/inspectionData/inspections.test")
         public void testCanBeVal_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/canBeVal/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/canBeVal/inspectionData/inspections.test");
         }
 
         @TestMetadata("conflictingExtensionProperty/inspectionData/inspections.test")
         public void testConflictingExtensionProperty_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test");
         }
 
         @TestMetadata("constantConditionIf/inspectionData/inspections.test")
         public void testConstantConditionIf_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/constantConditionIf/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/constantConditionIf/inspectionData/inspections.test");
         }
 
         @TestMetadata("convertLambdaToReference/inspectionData/inspections.test")
         public void testConvertLambdaToReference_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/convertLambdaToReference/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/convertLambdaToReference/inspectionData/inspections.test");
         }
 
         @TestMetadata("convertSecondaryToPrimary/inspectionData/inspections.test")
         public void testConvertSecondaryToPrimary_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/convertSecondaryToPrimary/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/convertSecondaryToPrimary/inspectionData/inspections.test");
         }
 
         @TestMetadata("copyWithoutNamedArguments/inspectionData/inspections.test")
         public void testCopyWithoutNamedArguments_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/copyWithoutNamedArguments/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/copyWithoutNamedArguments/inspectionData/inspections.test");
         }
 
         @TestMetadata("dataClassPrivateConstructor/inspectionData/inspections.test")
         public void testDataClassPrivateConstructor_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/dataClassPrivateConstructor/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/dataClassPrivateConstructor/inspectionData/inspections.test");
         }
 
         @TestMetadata("destructuringWrongName/inspectionData/inspections.test")
         public void testDestructuringWrongName_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/destructuringWrongName/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/destructuringWrongName/inspectionData/inspections.test");
         }
 
         @TestMetadata("dynamic/inspectionData/inspections.test")
         public void testDynamic_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/dynamic/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/dynamic/inspectionData/inspections.test");
         }
 
         @TestMetadata("emptyRange/inspectionData/inspections.test")
         public void testEmptyRange_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/emptyRange/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/emptyRange/inspectionData/inspections.test");
         }
 
         @TestMetadata("equalsAndHashCode/inspectionData/inspections.test")
         public void testEqualsAndHashCode_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test");
         }
 
         @TestMetadata("gradleWrongPluginVersion/inspectionData/inspections.test")
         public void testGradleWrongPluginVersion_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/gradleWrongPluginVersion/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/gradleWrongPluginVersion/inspectionData/inspections.test");
         }
 
         @TestMetadata("hasPlatformType/inspectionData/inspections.test")
         public void testHasPlatformType_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/hasPlatformType/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/hasPlatformType/inspectionData/inspections.test");
         }
 
         @TestMetadata("javaCollectionsStaticMethodOnImmutableList/inspectionData/inspections.test")
         public void testJavaCollectionsStaticMethodOnImmutableList_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/javaCollectionsStaticMethodOnImmutableList/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/javaCollectionsStaticMethodOnImmutableList/inspectionData/inspections.test");
         }
 
         @TestMetadata("kt18195/inspectionData/inspections.test")
         public void testKt18195_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/kt18195/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/kt18195/inspectionData/inspections.test");
         }
 
         @TestMetadata("leakingThis/inspectionData/inspections.test")
         public void testLeakingThis_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/leakingThis/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/leakingThis/inspectionData/inspections.test");
         }
 
         @TestMetadata("memberVisibilityCanBePrivate/inspectionData/inspections.test")
         public void testMemberVisibilityCanBePrivate_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/memberVisibilityCanBePrivate/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/memberVisibilityCanBePrivate/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/class/inspectionData/inspections.test")
         public void testNaming_class_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/class/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/class/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/enumEntry/inspectionData/inspections.test")
         public void testNaming_enumEntry_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/enumEntry/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/enumEntry/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/function/inspectionData/inspections.test")
         public void testNaming_function_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/function/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/function/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/objectProperty/inspectionData/inspections.test")
         public void testNaming_objectProperty_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/objectProperty/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/objectProperty/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/privateProperty/inspectionData/inspections.test")
         public void testNaming_privateProperty_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/privateProperty/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/privateProperty/inspectionData/inspections.test");
         }
 
         @TestMetadata("naming/property/inspectionData/inspections.test")
         public void testNaming_property_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/naming/property/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/naming/property/inspectionData/inspections.test");
         }
 
         @TestMetadata("nullableBooleanElvis/inspectionData/inspections.test")
         public void testNullableBooleanElvis_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/nullableBooleanElvis/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/nullableBooleanElvis/inspectionData/inspections.test");
         }
 
         @TestMetadata("overridingDeprecatedMember/inspectionData/inspections.test")
         public void testOverridingDeprecatedMember_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/overridingDeprecatedMember/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/overridingDeprecatedMember/inspectionData/inspections.test");
         }
 
         @TestMetadata("protectedInFinal/inspectionData/inspections.test")
         public void testProtectedInFinal_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/protectedInFinal/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/protectedInFinal/inspectionData/inspections.test");
         }
 
         @TestMetadata("publicApiImplicitType/inspectionData/inspections.test")
         public void testPublicApiImplicitType_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/publicApiImplicitType/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/publicApiImplicitType/inspectionData/inspections.test");
         }
 
         @TestMetadata("recursivePropertyAccessor/inspectionData/inspections.test")
         public void testRecursivePropertyAccessor_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/recursivePropertyAccessor/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/recursivePropertyAccessor/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantIf/inspectionData/inspections.test")
         public void testRedundantIf_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantIf/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantIf/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantModalityModifier/inspectionData/inspections.test")
         public void testRedundantModalityModifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantModalityModifier/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantModalityModifier/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantNotNullExtensionReceiverOfInline/inspectionData/inspections.test")
         public void testRedundantNotNullExtensionReceiverOfInline_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantNotNullExtensionReceiverOfInline/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantNotNullExtensionReceiverOfInline/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantSamConstructor/inspectionData/inspections.test")
         public void testRedundantSamConstructor_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantSemicolon/inspectionData/inspections.test")
         public void testRedundantSemicolon_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantSemicolon/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantSemicolon/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantSuspendModifier/inspectionData/inspections.test")
         public void testRedundantSuspendModifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantSuspendModifier/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantSuspendModifier/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantUnitReturnType/inspectionData/inspections.test")
         public void testRedundantUnitReturnType_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test");
         }
 
         @TestMetadata("redundantVisibilityModifier/inspectionData/inspections.test")
         public void testRedundantVisibilityModifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantVisibilityModifier/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/redundantVisibilityModifier/inspectionData/inspections.test");
         }
 
         @TestMetadata("reformat/inspectionData/inspections.test")
         public void testReformat_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/reformat/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/reformat/inspectionData/inspections.test");
         }
 
         @TestMetadata("removeSetterParameterType/inspectionData/inspections.test")
         public void testRemoveSetterParameterType_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test");
         }
 
         @TestMetadata("removeSingleExpressionStringTemplate/inspectionData/inspections.test")
         public void testRemoveSingleExpressionStringTemplate_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/removeSingleExpressionStringTemplate/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/removeSingleExpressionStringTemplate/inspectionData/inspections.test");
         }
 
         @TestMetadata("removeToStringInStringTemplate/inspectionData/inspections.test")
         public void testRemoveToStringInStringTemplate_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/removeToStringInStringTemplate/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/removeToStringInStringTemplate/inspectionData/inspections.test");
         }
 
         @TestMetadata("replaceArrayEqualityOpWithArraysEquals/inspectionData/inspections.test")
         public void testReplaceArrayEqualityOpWithArraysEquals_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/replaceArrayEqualityOpWithArraysEquals/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/replaceArrayEqualityOpWithArraysEquals/inspectionData/inspections.test");
         }
 
         @TestMetadata("replaceCallWithComparison/inspectionData/inspections.test")
         public void testReplaceCallWithComparison_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/replaceCallWithComparison/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/replaceCallWithComparison/inspectionData/inspections.test");
         }
 
         @TestMetadata("replaceRangeToWithUntil/inspectionData/inspections.test")
         public void testReplaceRangeToWithUntil_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/replaceRangeToWithUntil/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/replaceRangeToWithUntil/inspectionData/inspections.test");
         }
 
         @TestMetadata("sealedSubClassCanBeObject/inspectionData/inspections.test")
         public void testSealedSubClassCanBeObject_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/sealedSubClassCanBeObject/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/sealedSubClassCanBeObject/inspectionData/inspections.test");
         }
 
         @TestMetadata("sortModifiers/inspectionData/inspections.test")
         public void testSortModifiers_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/sortModifiers/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/sortModifiers/inspectionData/inspections.test");
         }
 
         @TestMetadata("spelling/inspectionData/inspections.test")
         public void testSpelling_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/spelling/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/spelling/inspectionData/inspections.test");
         }
 
         @TestMetadata("suspiciousEqualsCombination/inspectionData/inspections.test")
         public void testSuspiciousEqualsCombination_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/suspiciousEqualsCombination/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/suspiciousEqualsCombination/inspectionData/inspections.test");
         }
 
         @TestMetadata("twoSetOfTypeparameters/inspectionData/inspections.test")
         public void testTwoSetOfTypeparameters_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedEquals/inspectionData/inspections.test")
         public void testUnusedEquals_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedEquals/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedEquals/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedImport/inspectionData/inspections.test")
         public void testUnusedImport_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedImport/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedImport/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedLambdaExpressionBody/inspectionData/inspections.test")
         public void testUnusedLambdaExpressionBody_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedLambdaExpressionBody/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedLambdaExpressionBody/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedReceiverParameter/inspectionData/inspections.test")
         public void testUnusedReceiverParameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/class/inspectionData/inspections.test")
         public void testUnusedSymbol_class_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/enum/inspectionData/inspections.test")
         public void testUnusedSymbol_enum_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/function/inspectionData/inspections.test")
         public void testUnusedSymbol_function_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/js/inspectionData/inspections.test")
         public void testUnusedSymbol_js_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/object/inspectionData/inspections.test")
         public void testUnusedSymbol_object_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/parameter/inspectionData/inspections.test")
         public void testUnusedSymbol_parameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/property/inspectionData/inspections.test")
         public void testUnusedSymbol_property_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/typeAlias/inspectionData/inspections.test")
         public void testUnusedSymbol_typeAlias_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeAlias/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/typeAlias/inspectionData/inspections.test");
         }
 
         @TestMetadata("unusedSymbol/typeParameter/inspectionData/inspections.test")
         public void testUnusedSymbol_typeParameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test");
         }
 
         @TestMetadata("wrapUnaryOperator/inspectionData/inspections.test")
         public void testWrapUnaryOperator_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/wrapUnaryOperator/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspections/wrapUnaryOperator/inspectionData/inspections.test");
         }
     }
 
@@ -491,32 +424,32 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InspectionsLocal extends AbstractInspectionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInInspectionsLocal() throws Exception {
             KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/inspectionsLocal"), Pattern.compile("^(inspections\\.test)$"), TargetBackend.ANY);
         }
 
         @TestMetadata("branched/ifThenToSafeAccess/inspectionData/inspections.test")
         public void testBranched_ifThenToSafeAccess_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/inspectionData/inspections.test");
         }
 
         @TestMetadata("conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test")
         public void testConventionNameCalls_replaceGetOrSet_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test");
         }
 
         @TestMetadata("deprecatedCallableAddReplaceWith/inspectionData/inspections.test")
         public void testDeprecatedCallableAddReplaceWith_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
         }
 
         @TestMetadata("simplifyNegatedBinaryExpression/inspectionData/inspections.test")
         public void testSimplifyNegatedBinaryExpression_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inspectionData/inspections.test");
-            doTest(fileName);
+            runTest("idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inspectionData/inspections.test");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java

@@ -21,28 +21,34 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLineMarker() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("MethodSeparators.kt")
     public void testMethodSeparators() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/MethodSeparators.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/lineMarker/MethodSeparators.kt");
     }
 
     @TestMetadata("idea/testData/codeInsight/lineMarker/dslMarker")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DslMarker extends AbstractLineMarkersTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInDslMarker() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/dslMarker"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("markerAnnotationDeclaration.kt")
         public void testMarkerAnnotationDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/dslMarker/markerAnnotationDeclaration.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/dslMarker/markerAnnotationDeclaration.kt");
         }
     }
 
@@ -50,164 +56,142 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class OverrideImplement extends AbstractLineMarkersTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInOverrideImplement() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("BadCodeNoExceptions.kt")
         public void testBadCodeNoExceptions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt");
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt");
         }
 
         @TestMetadata("ClassObjectInStaticNestedClass.kt")
         public void testClassObjectInStaticNestedClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt");
         }
 
         @TestMetadata("DelegatedFun.kt")
         public void testDelegatedFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt");
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt");
         }
 
         @TestMetadata("EnumEntry.kt")
         public void testEnumEntry() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt");
         }
 
         @TestMetadata("FakeOverrideForClasses.kt")
         public void testFakeOverrideForClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt");
         }
 
         @TestMetadata("FakeOverrideFun.kt")
         public void testFakeOverrideFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt");
         }
 
         @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.kt")
         public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt");
         }
 
         @TestMetadata("FakeOverrideProperty.kt")
         public void testFakeOverrideProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt");
         }
 
         @TestMetadata("FakeOverrideToStringInTrait.kt")
         public void testFakeOverrideToStringInTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt");
         }
 
         @TestMetadata("FakeOverridesForTraitFunWithImpl.kt")
         public void testFakeOverridesForTraitFunWithImpl() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt");
         }
 
         @TestMetadata("NavigateToSeveralSuperElements.kt")
         public void testNavigateToSeveralSuperElements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt");
         }
 
         @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt")
         public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt");
         }
 
         @TestMetadata("Overloads.kt")
         public void testOverloads() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt");
         }
 
         @TestMetadata("OverrideFunction.kt")
         public void testOverrideFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt");
         }
 
         @TestMetadata("OverrideIconForOverloadMethodBug.kt")
         public void testOverrideIconForOverloadMethodBug() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt");
         }
 
         @TestMetadata("OverrideMemberOfAbstractClass.kt")
         public void testOverrideMemberOfAbstractClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt");
         }
 
         @TestMetadata("OverridenTraitDeclarations.kt")
         public void testOverridenTraitDeclarations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt");
         }
 
         @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt")
         public void testOverridingTooltipOnDefaultTraitImpl() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt");
         }
 
         @TestMetadata("PrimaryConstructorOpen.kt")
         public void testPrimaryConstructorOpen() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt");
         }
 
         @TestMetadata("PrimaryConstructorOverride.kt")
         public void testPrimaryConstructorOverride() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt");
         }
 
         @TestMetadata("PropertyOverride.kt")
         public void testPropertyOverride() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt");
         }
 
         @TestMetadata("SealedClass.kt")
         public void testSealedClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/SealedClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/SealedClass.kt");
         }
 
         @TestMetadata("ToStringInTrait.kt")
         public void testToStringInTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt");
         }
     }
 
@@ -215,116 +199,102 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RecursiveCall extends AbstractLineMarkersTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRecursiveCall() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/recursiveCall"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("companionInvoke.kt")
         public void testCompanionInvoke() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/companionInvoke.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/companionInvoke.kt");
         }
 
         @TestMetadata("conventionCall.kt")
         public void testConventionCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt");
         }
 
         @TestMetadata("differentImplicitReceiver.kt")
         public void testDifferentImplicitReceiver() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt");
         }
 
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt");
         }
 
         @TestMetadata("generic.kt")
         public void testGeneric() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt");
         }
 
         @TestMetadata("inInlinedFunctionExpression.kt")
         public void testInInlinedFunctionExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt");
         }
 
         @TestMetadata("inInlinedLambda.kt")
         public void testInInlinedLambda() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt");
         }
 
         @TestMetadata("inLambda.kt")
         public void testInLambda() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt");
         }
 
         @TestMetadata("localClass.kt")
         public void testLocalClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt");
         }
 
         @TestMetadata("localFun.kt")
         public void testLocalFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt");
         }
 
         @TestMetadata("methodReference.kt")
         public void testMethodReference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt");
         }
 
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt");
         }
 
         @TestMetadata("otherQualifier.kt")
         public void testOtherQualifier() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt");
         }
 
         @TestMetadata("propertyAccessors.kt")
         public void testPropertyAccessors() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/propertyAccessors.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/propertyAccessors.kt");
         }
 
         @TestMetadata("severalCallsInOneLine.kt")
         public void testSeveralCallsInOneLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt");
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt");
         }
 
         @TestMetadata("superQualifier.kt")
         public void testSuperQualifier() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt");
         }
 
         @TestMetadata("thisQualifier.kt")
         public void testThisQualifier() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt");
         }
     }
 
@@ -332,20 +302,22 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RunMarkers extends AbstractLineMarkersTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRunMarkers() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/runMarkers"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("jUnitTestClassWithSubclasses.kt")
         public void testJUnitTestClassWithSubclasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt");
         }
 
         @TestMetadata("testNGTestClassWithSubclasses.kt")
         public void testTestNGTestClassWithSubclasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt");
         }
     }
 
@@ -353,20 +325,22 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SuspendCall extends AbstractLineMarkersTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSuspendCall() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/suspendCall"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("suspendCall.kt")
         public void testSuspendCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/suspendCall/suspendCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/suspendCall/suspendCall.kt");
         }
 
         @TestMetadata("suspendIteration.kt")
         public void testSuspendIteration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/suspendCall/suspendIteration.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/lineMarker/suspendCall/suspendIteration.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/MoveOnCutPasteTestGenerated.java

@@ -21,55 +21,51 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MoveOnCutPasteTestGenerated extends AbstractMoveOnCutPasteTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMoveDeclarations() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/moveDeclarations"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("ChangePackage.kt")
     public void testChangePackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/ChangePackage.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/ChangePackage.kt");
     }
 
     @TestMetadata("Copy.kt")
     public void testCopy() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/Copy.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/Copy.kt");
     }
 
     @TestMetadata("FromAnonymousObject.kt")
     public void testFromAnonymousObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/FromAnonymousObject.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/FromAnonymousObject.kt");
     }
 
     @TestMetadata("FromCompanionObjectToTopLevel.kt")
     public void testFromCompanionObjectToTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/FromCompanionObjectToTopLevel.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/FromCompanionObjectToTopLevel.kt");
     }
 
     @TestMetadata("FromObjectToSameFile.kt")
     public void testFromObjectToSameFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/FromObjectToSameFile.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/FromObjectToSameFile.kt");
     }
 
     @TestMetadata("FromObjectToTopLevel.kt")
     public void testFromObjectToTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/FromObjectToTopLevel.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/FromObjectToTopLevel.kt");
     }
 
     @TestMetadata("OptimizeImportsAfterCut.kt")
     public void testOptimizeImportsAfterCut() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/OptimizeImportsAfterCut.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/OptimizeImportsAfterCut.kt");
     }
 
     @TestMetadata("SamePackage.kt")
     public void testSamePackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/moveDeclarations/SamePackage.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/moveDeclarations/SamePackage.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java

@@ -21,43 +21,41 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMultiFileInspections() throws Exception {
         KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileInspections"), Pattern.compile("^(.+)\\.test$"), TargetBackend.ANY);
     }
 
     @TestMetadata("fakeJvmFieldConstant/fakeJvmFieldConstant.test")
     public void testFakeJvmFieldConstant_FakeJvmFieldConstant() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/fakeJvmFieldConstant/fakeJvmFieldConstant.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/fakeJvmFieldConstant/fakeJvmFieldConstant.test");
     }
 
     @TestMetadata("invalidBundleOrProperty/invalidBundleOrProperty.test")
     public void testInvalidBundleOrProperty_InvalidBundleOrProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test");
     }
 
     @TestMetadata("kotlinInternalInJava/kotlinInternalInJava.test")
     public void testKotlinInternalInJava_KotlinInternalInJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/kotlinInternalInJava/kotlinInternalInJava.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/kotlinInternalInJava/kotlinInternalInJava.test");
     }
 
     @TestMetadata("mainInTwoModules/mainInTwoModules.test")
     public void testMainInTwoModules_MainInTwoModules() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/mainInTwoModules/mainInTwoModules.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/mainInTwoModules/mainInTwoModules.test");
     }
 
     @TestMetadata("mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test")
     public void testMismatchedProjectAndDirectory_MismatchedProjectAndDirectory() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test");
     }
 
     @TestMetadata("platformExtensionReceiverOfInline/platformExtensionReceiverOfInline.test")
     public void testPlatformExtensionReceiverOfInline_PlatformExtensionReceiverOfInline() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/platformExtensionReceiverOfInline/platformExtensionReceiverOfInline.test");
-        doTest(fileName);
+        runTest("idea/testData/multiFileInspections/platformExtensionReceiverOfInline/platformExtensionReceiverOfInline.test");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java

@@ -21,247 +21,211 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInOutOfBlock() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("Class_Class_FunNoType_Block.kt")
     public void testClass_Class_FunNoType_Block() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt");
     }
 
     @TestMetadata("Class_Class_FunNoType_Block_Expression.kt")
     public void testClass_Class_FunNoType_Block_Expression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt");
     }
 
     @TestMetadata("FunInFun.kt")
     public void testFunInFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
     }
 
     @TestMetadata("FunInInitBlock.kt")
     public void testFunInInitBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInInitBlock.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunInInitBlock.kt");
     }
 
     @TestMetadata("FunNoBody.kt")
     public void testFunNoBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
     }
 
     @TestMetadata("FunNoType_Block.kt")
     public void testFunNoType_Block() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt");
     }
 
     @TestMetadata("FunNoType_Block_Class.kt")
     public void testFunNoType_Block_Class() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt");
     }
 
     @TestMetadata("FunWithType_Initializer.kt")
     public void testFunWithType_Initializer() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt");
     }
 
     @TestMetadata("FunWithType_Initializer_Expression.kt")
     public void testFunWithType_Initializer_Expression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt");
     }
 
     @TestMetadata("InAntonymsObjectDeclaration.kt")
     public void testInAntonymsObjectDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
     }
 
     @TestMetadata("InClass.kt")
     public void testInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InClass.kt");
     }
 
     @TestMetadata("InClassInClass.kt")
     public void testInClassInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassInClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InClassInClass.kt");
     }
 
     @TestMetadata("InClassPropertyAccessor.kt")
     public void testInClassPropertyAccessor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
     }
 
     @TestMetadata("InFunInFunWithBody.kt")
     public void testInFunInFunWithBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
     }
 
     @TestMetadata("InFunInFunctionInitializerInFun.kt")
     public void testInFunInFunctionInitializerInFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt");
     }
 
     @TestMetadata("InFunInMultiDeclaration.kt")
     public void testInFunInMultiDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
     }
 
     @TestMetadata("InFunInProperty.kt")
     public void testInFunInProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt");
     }
 
     @TestMetadata("InFunInPropertyInObjectLiteral.kt")
     public void testInFunInPropertyInObjectLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt");
     }
 
     @TestMetadata("InFunObjectLiteral.kt")
     public void testInFunObjectLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt");
     }
 
     @TestMetadata("InFunWithInference.kt")
     public void testInFunWithInference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
     }
 
     @TestMetadata("InFunctionLiteral.kt")
     public void testInFunctionLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
     }
 
     @TestMetadata("InGlobalPropertyWithGetter.kt")
     public void testInGlobalPropertyWithGetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
     }
 
     @TestMetadata("InMethod.kt")
     public void testInMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InMethod.kt");
     }
 
     @TestMetadata("InPropertyAccessorWithInference.kt")
     public void testInPropertyAccessorWithInference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
     }
 
     @TestMetadata("InPropertyAccessorWithInferenceInClass.kt")
     public void testInPropertyAccessorWithInferenceInClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInferenceInClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInferenceInClass.kt");
     }
 
     @TestMetadata("InPropertyWithFunctionLiteral.kt")
     public void testInPropertyWithFunctionLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
     }
 
     @TestMetadata("InPropertyWithInference.kt")
     public void testInPropertyWithInference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
     }
 
     @TestMetadata("InSuperTypeCallCallInLambdaInCall.kt")
     public void testInSuperTypeCallCallInLambdaInCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InSuperTypeCallCallInLambdaInCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InSuperTypeCallCallInLambdaInCall.kt");
     }
 
     @TestMetadata("InSuperTypeCallInLambaInBody.kt")
     public void testInSuperTypeCallInLambaInBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InSuperTypeCallInLambaInBody.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InSuperTypeCallInLambaInBody.kt");
     }
 
     @TestMetadata("InSuperTypeCallInLambdaParameters.kt")
     public void testInSuperTypeCallInLambdaParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InSuperTypeCallInLambdaParameters.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InSuperTypeCallInLambdaParameters.kt");
     }
 
     @TestMetadata("InitBlock.kt")
     public void testInitBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InitBlock.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/InitBlock.kt");
     }
 
     @TestMetadata("Object_FunNoType_Block.kt")
     public void testObject_FunNoType_Block() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt");
     }
 
     @TestMetadata("Object_FunNoType_Block_Expression.kt")
     public void testObject_FunNoType_Block_Expression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt");
     }
 
     @TestMetadata("PropNotNullType_Initializer_ObjectLiteral_Fun.kt")
     public void testPropNotNullType_Initializer_ObjectLiteral_Fun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt");
     }
 
     @TestMetadata("PropNullType_Initializer_If_Fun.kt")
     public void testPropNullType_Initializer_If_Fun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt");
     }
 
     @TestMetadata("PropNullType_Initializer_ObjectLiteral_Fun.kt")
     public void testPropNullType_Initializer_ObjectLiteral_Fun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt");
     }
 
     @TestMetadata("PropertyNoType_Initializer_String.kt")
     public void testPropertyNoType_Initializer_String() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt");
     }
 
     @TestMetadata("PropertyWithType_Initializer_String.kt")
     public void testPropertyWithType_Initializer_String() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt");
     }
 
     @TestMetadata("StringInSuperConstroctorCall.kt")
     public void testStringInSuperConstroctorCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/StringInSuperConstroctorCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/StringInSuperConstroctorCall.kt");
     }
 
     @TestMetadata("WholeFileChanged.kt")
     public void testWholeFileChanged() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/WholeFileChanged.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/outOfBlock/WholeFileChanged.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java

@@ -21,79 +21,71 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CodeInsightActionTestGenerated extends AbstractCodeInsightActionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInSecondaryConstructors() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("empty.kt")
     public void testEmpty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt");
     }
 
     @TestMetadata("emptyExists.kt")
     public void testEmptyExists() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt");
     }
 
     @TestMetadata("javaSupers.kt")
     public void testJavaSupers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt");
     }
 
     @TestMetadata("javaSupersWithGenerics.kt")
     public void testJavaSupersWithGenerics() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt");
     }
 
     @TestMetadata("primaryExists.kt")
     public void testPrimaryExists() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt");
     }
 
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt");
     }
 
     @TestMetadata("propertiesWithSupers.kt")
     public void testPropertiesWithSupers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt");
     }
 
     @TestMetadata("supers.kt")
     public void testSupers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt");
     }
 
     @TestMetadata("supersAllExist.kt")
     public void testSupersAllExist() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt");
     }
 
     @TestMetadata("supersSomeExist.kt")
     public void testSupersSomeExist() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt");
     }
 
     @TestMetadata("supersWithGenerics.kt")
     public void testSupersWithGenerics() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt");
     }
 
     @TestMetadata("supersWithVarargs.kt")
     public void testSupersWithVarargs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java

@@ -21,175 +21,151 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateHashCodeAndEqualsActionTestGenerated extends AbstractGenerateHashCodeAndEqualsActionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInEqualsWithHashCode() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/equalsWithHashCode"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("annotation.kt")
     public void testAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt");
     }
 
     @TestMetadata("arrays.kt")
     public void testArrays() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/arrays.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/arrays.kt");
     }
 
     @TestMetadata("customAccessors.kt")
     public void testCustomAccessors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt");
     }
 
     @TestMetadata("dataClass.kt")
     public void testDataClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt");
     }
 
     @TestMetadata("dataClassHasArrayProperty.kt")
     public void testDataClassHasArrayProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt");
     }
 
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt");
     }
 
     @TestMetadata("explicitDefaultAccessors.kt")
     public void testExplicitDefaultAccessors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt");
     }
 
     @TestMetadata("genericClass.kt")
     public void testGenericClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt");
     }
 
     @TestMetadata("genericClassWithIsCheck.kt")
     public void testGenericClassWithIsCheck() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt");
     }
 
     @TestMetadata("interface.kt")
     public void testInterface() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt");
     }
 
     @TestMetadata("keepQuotes.kt")
     public void testKeepQuotes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt");
     }
 
     @TestMetadata("multipleVars.kt")
     public void testMultipleVars() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt");
     }
 
     @TestMetadata("multipleVarsCommon.kt")
     public void testMultipleVarsCommon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt");
     }
 
     @TestMetadata("multipleVarsJS.kt")
     public void testMultipleVarsJS() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt");
     }
 
     @TestMetadata("multipleVarsNullable.kt")
     public void testMultipleVarsNullable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt");
     }
 
     @TestMetadata("multipleVarsWithSuperClass.kt")
     public void testMultipleVarsWithSuperClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt");
     }
 
     @TestMetadata("nameClash.kt")
     public void testNameClash() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt");
     }
 
     @TestMetadata("noVars.kt")
     public void testNoVars() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt");
     }
 
     @TestMetadata("noVarsCommon.kt")
     public void testNoVarsCommon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt");
     }
 
     @TestMetadata("noVarsJS.kt")
     public void testNoVarsJS() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt");
     }
 
     @TestMetadata("noVarsWithSuperClass.kt")
     public void testNoVarsWithSuperClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt");
     }
 
     @TestMetadata("nullableArrays.kt")
     public void testNullableArrays() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt");
     }
 
     @TestMetadata("object.kt")
     public void testObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt");
     }
 
     @TestMetadata("singleVar.kt")
     public void testSingleVar() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt");
     }
 
     @TestMetadata("singleVarNullable.kt")
     public void testSingleVarNullable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt");
     }
 
     @TestMetadata("singleVarWithIsCheck.kt")
     public void testSingleVarWithIsCheck() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt");
     }
 
     @TestMetadata("singleVarWithJavaSuperClass.kt")
     public void testSingleVarWithJavaSuperClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt");
     }
 
     @TestMetadata("singleVarWithSuperClass.kt")
     public void testSingleVarWithSuperClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenerateTestSupportMethodActionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInTestFrameworkSupport() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,50 +33,47 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JUnit4 extends AbstractGenerateTestSupportMethodActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJUnit4() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("dataMethod.kt")
         public void testDataMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt");
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt");
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt");
         }
 
         @TestMetadata("setUpOverrides.kt")
         public void testSetUpOverrides() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt");
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt");
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt");
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt");
         }
     }
 
@@ -80,38 +81,37 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Junit3 extends AbstractGenerateTestSupportMethodActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInJunit3() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/junit3"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt");
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt");
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt");
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt");
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt");
         }
     }
 
@@ -119,50 +119,47 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TestNG extends AbstractGenerateTestSupportMethodActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTestNG() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/testNG"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("dataMethod.kt")
         public void testDataMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt");
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt");
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt");
         }
 
         @TestMetadata("setUpOverrides.kt")
         public void testSetUpOverrides() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt");
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt");
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt");
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateToStringActionTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateToStringActionTestGenerated extends AbstractGenerateToStringActionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInToString() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/toString"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,26 +33,27 @@ public class GenerateToStringActionTestGenerated extends AbstractGenerateToStrin
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Common extends AbstractGenerateToStringActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCommon() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/toString/common"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("annotation.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/common/annotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/common/annotation.kt");
         }
 
         @TestMetadata("interface.kt")
         public void testInterface() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/common/interface.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/common/interface.kt");
         }
 
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/common/object.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/common/object.kt");
         }
     }
 
@@ -56,62 +61,57 @@ public class GenerateToStringActionTestGenerated extends AbstractGenerateToStrin
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MultipeTemplates extends AbstractGenerateToStringActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInMultipeTemplates() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/toString/multipeTemplates"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("arrays.kt")
         public void testArrays() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt");
         }
 
         @TestMetadata("customAccessors.kt")
         public void testCustomAccessors() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt");
         }
 
         @TestMetadata("dataClass.kt")
         public void testDataClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt");
         }
 
         @TestMetadata("keepQuotes.kt")
         public void testKeepQuotes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt");
         }
 
         @TestMetadata("multipleVars.kt")
         public void testMultipleVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt");
         }
 
         @TestMetadata("multipleVarsWithSuperClass.kt")
         public void testMultipleVarsWithSuperClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt");
         }
 
         @TestMetadata("noVars.kt")
         public void testNoVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt");
         }
 
         @TestMetadata("singleVar.kt")
         public void testSingleVar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt");
         }
 
         @TestMetadata("superClassNoVars.kt")
         public void testSuperClassNoVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt");
         }
     }
 
@@ -119,68 +119,62 @@ public class GenerateToStringActionTestGenerated extends AbstractGenerateToStrin
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SingleTemplate extends AbstractGenerateToStringActionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSingleTemplate() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/toString/singleTemplate"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("arrays.kt")
         public void testArrays() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/arrays.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/arrays.kt");
         }
 
         @TestMetadata("customAccessors.kt")
         public void testCustomAccessors() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt");
         }
 
         @TestMetadata("dataClass.kt")
         public void testDataClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/dataClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/dataClass.kt");
         }
 
         @TestMetadata("explicitDefaultAccessors.kt")
         public void testExplicitDefaultAccessors() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt");
         }
 
         @TestMetadata("keepQuotes.kt")
         public void testKeepQuotes() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/keepQuotes.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/keepQuotes.kt");
         }
 
         @TestMetadata("multipleVars.kt")
         public void testMultipleVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt");
         }
 
         @TestMetadata("multipleVarsWithSuperClass.kt")
         public void testMultipleVarsWithSuperClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt");
         }
 
         @TestMetadata("noVars.kt")
         public void testNoVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/noVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/noVars.kt");
         }
 
         @TestMetadata("singleVar.kt")
         public void testSingleVar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt");
         }
 
         @TestMetadata("superClassNoVars.kt")
         public void testSuperClassNoVars() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt");
-            doTest(fileName);
+            runTest("idea/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveLeftRightTestGenerated.java

@@ -21,91 +21,81 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MoveLeftRightTestGenerated extends AbstractMoveLeftRightTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMoveLeftRight() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveLeftRight"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("annotationParams.kt")
     public void testAnnotationParams() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/annotationParams.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/annotationParams.kt");
     }
 
     @TestMetadata("basesList.kt")
     public void testBasesList() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/basesList.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/basesList.kt");
     }
 
     @TestMetadata("callArgs1.kt")
     public void testCallArgs1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/callArgs1.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/callArgs1.kt");
     }
 
     @TestMetadata("callArgs2.kt")
     public void testCallArgs2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/callArgs2.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/callArgs2.kt");
     }
 
     @TestMetadata("callArgs3.kt")
     public void testCallArgs3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/callArgs3.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/callArgs3.kt");
     }
 
     @TestMetadata("callArgs4.kt")
     public void testCallArgs4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/callArgs4.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/callArgs4.kt");
     }
 
     @TestMetadata("callArgs5.kt")
     public void testCallArgs5() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/callArgs5.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/callArgs5.kt");
     }
 
     @TestMetadata("funParams1.kt")
     public void testFunParams1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/funParams1.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/funParams1.kt");
     }
 
     @TestMetadata("funParams2.kt")
     public void testFunParams2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/funParams2.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/funParams2.kt");
     }
 
     @TestMetadata("funParams3.kt")
     public void testFunParams3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/funParams3.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/funParams3.kt");
     }
 
     @TestMetadata("funParams4.kt")
     public void testFunParams4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/funParams4.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/funParams4.kt");
     }
 
     @TestMetadata("indexArgs.kt")
     public void testIndexArgs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/indexArgs.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/indexArgs.kt");
     }
 
     @TestMetadata("lambdaParams.kt")
     public void testLambdaParams() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/lambdaParams.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/lambdaParams.kt");
     }
 
     @TestMetadata("typeArgs.kt")
     public void testTypeArgs() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveLeftRight/typeArgs.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/moveLeftRight/typeArgs.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/PostfixTemplateProviderTestGenerated.java

@@ -21,229 +21,196 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class PostfixTemplateProviderTestGenerated extends AbstractPostfixTemplateProviderTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInPostfix() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/postfix"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("assert.kt")
     public void testAssert() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/assert.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/assert.kt");
     }
 
     @TestMetadata("assertNonTopLevel.kt")
     public void testAssertNonTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/assertNonTopLevel.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/assertNonTopLevel.kt");
     }
 
     @TestMetadata("doNotProposeWrappingIncrement.kt")
     public void testDoNotProposeWrappingIncrement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/doNotProposeWrappingIncrement.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/doNotProposeWrappingIncrement.kt");
     }
 
     @TestMetadata("else.kt")
     public void testElse() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/else.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/else.kt");
     }
 
     @TestMetadata("for.kt")
     public void testFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/for.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/for.kt");
     }
 
     @TestMetadata("forOnMap.kt")
     public void testForOnMap() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/forOnMap.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/forOnMap.kt");
     }
 
     @TestMetadata("forOnString.kt")
     public void testForOnString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/forOnString.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/forOnString.kt");
     }
 
     @TestMetadata("if.kt")
     public void testIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/if.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/if.kt");
     }
 
     @TestMetadata("iter.kt")
     public void testIter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/iter.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/iter.kt");
     }
 
     @TestMetadata("noParOnLoop.kt")
     public void testNoParOnLoop() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/noParOnLoop.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/noParOnLoop.kt");
     }
 
     @TestMetadata("noReturnForNonStatement.kt")
     public void testNoReturnForNonStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/noReturnForNonStatement.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/noReturnForNonStatement.kt");
     }
 
     @TestMetadata("notBoolean.kt")
     public void testNotBoolean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/notBoolean.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/notBoolean.kt");
     }
 
     @TestMetadata("notString.kt")
     public void testNotString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/notString.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/notString.kt");
     }
 
     @TestMetadata("notnull.kt")
     public void testNotnull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/notnull.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/notnull.kt");
     }
 
     @TestMetadata("null.kt")
     public void testNull() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/null.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/null.kt");
     }
 
     @TestMetadata("par.kt")
     public void testPar() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/par.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/par.kt");
     }
 
     @TestMetadata("parAfterUserType.kt")
     public void testParAfterUserType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/parAfterUserType.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/parAfterUserType.kt");
     }
 
     @TestMetadata("parAssignment.kt")
     public void testParAssignment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/parAssignment.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/parAssignment.kt");
     }
 
     @TestMetadata("return.kt")
     public void testReturn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/return.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/return.kt");
     }
 
     @TestMetadata("returnFromLoop.kt")
     public void testReturnFromLoop() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/returnFromLoop.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/returnFromLoop.kt");
     }
 
     @TestMetadata("sout.kt")
     public void testSout() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/sout.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/sout.kt");
     }
 
     @TestMetadata("soutInIf.kt")
     public void testSoutInIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/soutInIf.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/soutInIf.kt");
     }
 
     @TestMetadata("soutInLoop.kt")
     public void testSoutInLoop() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/soutInLoop.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/soutInLoop.kt");
     }
 
     @TestMetadata("try.kt")
     public void testTry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/try.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/try.kt");
     }
 
     @TestMetadata("tryInLocalClass.kt")
     public void testTryInLocalClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/tryInLocalClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/tryInLocalClass.kt");
     }
 
     @TestMetadata("tryOnFor.kt")
     public void testTryOnFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/tryOnFor.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/tryOnFor.kt");
     }
 
     @TestMetadata("tryOnImportStatement.kt")
     public void testTryOnImportStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/tryOnImportStatement.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/tryOnImportStatement.kt");
     }
 
     @TestMetadata("tryOnStatement.kt")
     public void testTryOnStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/tryOnStatement.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/tryOnStatement.kt");
     }
 
     @TestMetadata("val.kt")
     public void testVal() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/val.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/val.kt");
     }
 
     @TestMetadata("valAfterReceiver.kt")
     public void testValAfterReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/valAfterReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/valAfterReceiver.kt");
     }
 
     @TestMetadata("valAfterSelector.kt")
     public void testValAfterSelector() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/valAfterSelector.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/valAfterSelector.kt");
     }
 
     @TestMetadata("valAtLamba.kt")
     public void testValAtLamba() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/valAtLamba.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/valAtLamba.kt");
     }
 
     @TestMetadata("valAtLambaArgumentInCall.kt")
     public void testValAtLambaArgumentInCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/valAtLambaArgumentInCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/valAtLambaArgumentInCall.kt");
     }
 
     @TestMetadata("var.kt")
     public void testVar() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/var.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/var.kt");
     }
 
     @TestMetadata("when.kt")
     public void testWhen() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/when.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/when.kt");
     }
 
     @TestMetadata("whenExpression.kt")
     public void testWhenExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/whenExpression.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/whenExpression.kt");
     }
 
     @TestMetadata("while.kt")
     public void testWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/while.kt");
-        doTest(fileName);
+        runTest("idea/testData/codeInsight/postfix/while.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java

@@ -23,56 +23,57 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class If extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIf() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/block.kt");
         }
 
         @TestMetadata("emptyLine.kt")
         public void testEmptyLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/emptyLine.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/emptyLine.kt");
         }
 
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
         }
 
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
         }
 
         @TestMetadata("usedAsExpression.kt")
         public void testUsedAsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/usedAsExpression.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/usedAsExpression.kt");
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt");
-            doTestWithIfSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/if/variable.kt");
         }
 
         @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MoveDeclarationsOut extends AbstractSurroundWithTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInMoveDeclarationsOut() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
@@ -81,20 +82,22 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Class extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInClass() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("classInType.kt")
                 public void testClassInType() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
                 }
 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
                 }
             }
 
@@ -102,26 +105,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Function extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInFunction() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("firstChildLocalFun.kt")
                 public void testFirstChildLocalFun() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
                 }
 
                 @TestMetadata("localFun.kt")
                 public void testLocalFun() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
                 }
 
                 @TestMetadata("unusedLocalFun.kt")
                 public void testUnusedLocalFun() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
                 }
             }
 
@@ -129,14 +133,17 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Object extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInObject() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("localObject.kt")
                 public void testLocalObject() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
                 }
             }
 
@@ -144,26 +151,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Order extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInOrder() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("twoClasses.kt")
                 public void testTwoClasses() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
                 }
 
                 @TestMetadata("valAndClass.kt")
                 public void testValAndClass() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
                 }
 
                 @TestMetadata("valOrder.kt")
                 public void testValOrder() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
                 }
             }
 
@@ -171,38 +179,37 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Val extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInVal() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("fullQualifiedType.kt")
                 public void testFullQualifiedType() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
                 }
 
                 @TestMetadata("fullQualifiedTypeWithoutTypeRef.kt")
                 public void testFullQualifiedTypeWithoutTypeRef() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
                 }
 
                 @TestMetadata("valWithTypeWithInitializer.kt")
                 public void testValWithTypeWithInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
                 }
 
                 @TestMetadata("valWithTypeWoInitializer.kt")
                 public void testValWithTypeWoInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
                 }
 
                 @TestMetadata("valWoTypeWithInitializer.kt")
                 public void testValWoTypeWithInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
                 }
             }
 
@@ -210,52 +217,54 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Var extends AbstractSurroundWithTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                }
+
                 public void testAllFilesPresentInVar() throws Exception {
                     KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                 }
 
                 @TestMetadata("varWithNotNullableTypeWithInitializer.kt")
                 public void testVarWithNotNullableTypeWithInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
                 }
 
                 @TestMetadata("varWithTypeWoInitializer.kt")
                 public void testVarWithTypeWoInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
                 }
 
                 @TestMetadata("varWoTypeWithInitializer.kt")
                 public void testVarWoTypeWithInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
-                    doTestWithIfSurrounder(fileName);
+                    runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
                 }
 
                 @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue")
                 @TestDataPath("$PROJECT_ROOT")
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class DefaultValue extends AbstractSurroundWithTest {
+                    private void runTest(String testDataFilePath) throws Exception {
+                        KotlinTestUtils.runTest(this::doTestWithIfSurrounder, TargetBackend.ANY, testDataFilePath);
+                    }
+
                     public void testAllFilesPresentInDefaultValue() throws Exception {
                         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                     }
 
                     @TestMetadata("boolean.kt")
                     public void testBoolean() throws Exception {
-                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
-                        doTestWithIfSurrounder(fileName);
+                        runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
                     }
 
                     @TestMetadata("nullable.kt")
                     public void testNullable() throws Exception {
-                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
-                        doTestWithIfSurrounder(fileName);
+                        runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
                     }
 
                     @TestMetadata("primitiveNumbers.kt")
                     public void testPrimitiveNumbers() throws Exception {
-                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
-                        doTestWithIfSurrounder(fileName);
+                        runTest("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
                     }
                 }
             }
@@ -266,56 +275,52 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class IfElse extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithIfElseSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIfElse() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
         }
 
         @TestMetadata("moveDeclarationsOutVal.kt")
         public void testMoveDeclarationsOutVal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
         }
 
         @TestMetadata("moveDeclarationsOutVar.kt")
         public void testMoveDeclarationsOutVar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
         }
 
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
         }
 
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
         }
 
         @TestMetadata("usedAsExpression.kt")
         public void testUsedAsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/usedAsExpression.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/usedAsExpression.kt");
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
-            doTestWithIfElseSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
         }
     }
 
@@ -323,26 +328,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class IfElseExpression extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithIfElseExpressionSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIfElseExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElseExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("asStatement.kt")
         public void testAsStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElseExpression/asStatement.kt");
-            doTestWithIfElseExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElseExpression/asStatement.kt");
         }
 
         @TestMetadata("paranthesized.kt")
         public void testParanthesized() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElseExpression/paranthesized.kt");
-            doTestWithIfElseExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElseExpression/paranthesized.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElseExpression/singleExpression.kt");
-            doTestWithIfElseExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElseExpression/singleExpression.kt");
         }
     }
 
@@ -350,20 +356,22 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class IfElseExpressionBraces extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithIfElseExpressionBracesSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInIfElseExpressionBraces() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElseExpressionBraces"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("asStatement.kt")
         public void testAsStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElseExpressionBraces/asStatement.kt");
-            doTestWithIfElseExpressionBracesSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElseExpressionBraces/asStatement.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElseExpressionBraces/singleExpression.kt");
-            doTestWithIfElseExpressionBracesSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/ifElseExpressionBraces/singleExpression.kt");
         }
     }
 
@@ -371,50 +379,47 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Not extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithNotSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInNot() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("booleanExpr.kt")
         public void testBooleanExpr() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
         }
 
         @TestMetadata("booleanExprAtCaret.kt")
         public void testBooleanExprAtCaret() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
         }
 
         @TestMetadata("expressionInIf.kt")
         public void testExpressionInIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
         }
 
         @TestMetadata("notExpression.kt")
         public void testNotExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
         }
 
         @TestMetadata("severalExpr.kt")
         public void testSeveralExpr() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
         }
 
         @TestMetadata("severalExprAtCaret.kt")
         public void testSeveralExprAtCaret() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt");
-            doTestWithNotSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/not/variable.kt");
         }
     }
 
@@ -422,88 +427,84 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Parentheses extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithParenthesesSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInParentheses() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("expr.kt")
         public void testExpr() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
-            doTestWithParenthesesSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
         }
 
         @TestMetadata("inIf.kt")
         public void testInIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
-            doTestWithParenthesesSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
         }
 
         @TestMetadata("partOfExpr.kt")
         public void testPartOfExpr() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
-            doTestWithParenthesesSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
         }
 
         @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NotApplicable extends AbstractSurroundWithTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithParenthesesSurrounder, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInNotApplicable() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
             @TestMetadata("if.kt")
             public void testIf() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
             }
 
             @TestMetadata("import.kt")
             public void testImport() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
             }
 
             @TestMetadata("importQualifiedFirst.kt")
             public void testImportQualifiedFirst() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
             }
 
             @TestMetadata("importQualifiedSecond.kt")
             public void testImportQualifiedSecond() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
             }
 
             @TestMetadata("packageName.kt")
             public void testPackageName() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
             }
 
             @TestMetadata("parameterName.kt")
             public void testParameterName() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
             }
 
             @TestMetadata("parameterWithType.kt")
             public void testParameterWithType() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
             }
 
             @TestMetadata("qualifiedExpressionSecond.kt")
             public void testQualifiedExpressionSecond() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
             }
 
             @TestMetadata("qualifiedExpressionSecondWithBracket.kt")
             public void testQualifiedExpressionSecondWithBracket() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
-                doTestWithParenthesesSurrounder(fileName);
+                runTest("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
             }
         }
     }
@@ -512,32 +513,32 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class StringTemplate extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithStringTemplateSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInStringTemplate() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
-            doTestWithStringTemplateSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
         }
 
         @TestMetadata("multiExpressionConstant.kt")
         public void testMultiExpressionConstant() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
-            doTestWithStringTemplateSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
         }
 
         @TestMetadata("singleConstant.kt")
         public void testSingleConstant() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
-            doTestWithStringTemplateSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
-            doTestWithStringTemplateSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
         }
     }
 
@@ -545,26 +546,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class When extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithWhenSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInWhen() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt");
-            doTestWithWhenSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/when/enum.kt");
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
-            doTestWithWhenSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
-            doTestWithWhenSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
         }
     }
 
@@ -572,32 +574,32 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatch extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithTryCatchSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTryCatch() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
-            doTestWithTryCatchSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
-            doTestWithTryCatchSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
-            doTestWithTryCatchSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
         }
 
         @TestMetadata("usedAsExpression.kt")
         public void testUsedAsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/usedAsExpression.kt");
-            doTestWithTryCatchSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatch/usedAsExpression.kt");
         }
     }
 
@@ -605,20 +607,22 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatchExpression extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithTryCatchExpressionSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTryCatchExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("asStatement.kt")
         public void testAsStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchExpression/asStatement.kt");
-            doTestWithTryCatchExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchExpression/asStatement.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchExpression/singleExpression.kt");
-            doTestWithTryCatchExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchExpression/singleExpression.kt");
         }
     }
 
@@ -626,26 +630,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatchFinally extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithTryCatchFinallySurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
-            doTestWithTryCatchFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
-            doTestWithTryCatchFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
         }
 
         @TestMetadata("usedAsExpression.kt")
         public void testUsedAsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/usedAsExpression.kt");
-            doTestWithTryCatchFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchFinally/usedAsExpression.kt");
         }
     }
 
@@ -653,20 +658,22 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatchFinallyExpression extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithTryCatchFinallyExpressionSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTryCatchFinallyExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinallyExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("asStatement.kt")
         public void testAsStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinallyExpression/asStatement.kt");
-            doTestWithTryCatchFinallyExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchFinallyExpression/asStatement.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinallyExpression/singleExpression.kt");
-            doTestWithTryCatchFinallyExpressionSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryCatchFinallyExpression/singleExpression.kt");
         }
     }
 
@@ -674,26 +681,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryFinally extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithTryFinallySurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInTryFinally() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
-            doTestWithTryFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
-            doTestWithTryFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
         }
 
         @TestMetadata("usedAsExpression.kt")
         public void testUsedAsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/usedAsExpression.kt");
-            doTestWithTryFinallySurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/tryFinally/usedAsExpression.kt");
         }
     }
 
@@ -701,26 +709,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FunctionLiteral extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithFunctionLiteralSurrounder, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInFunctionLiteral() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
-            doTestWithFunctionLiteralSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
         }
 
         @TestMetadata("multiStatement.kt")
         public void testMultiStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
-            doTestWithFunctionLiteralSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
-            doTestWithFunctionLiteralSurrounder(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
         }
     }
 
@@ -728,20 +737,22 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithIfExpression extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithSurroundWithIfExpression, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInWithIfExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/withIfExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("complexBoolean.kt")
         public void testComplexBoolean() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/withIfExpression/complexBoolean.kt");
-            doTestWithSurroundWithIfExpression(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/withIfExpression/complexBoolean.kt");
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/withIfExpression/variable.kt");
-            doTestWithSurroundWithIfExpression(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/withIfExpression/variable.kt");
         }
     }
 
@@ -749,26 +760,27 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithIfElseExpression extends AbstractSurroundWithTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithSurroundWithIfElseExpression, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInWithIfElseExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/withIfElseExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("complexBoolean.kt")
         public void testComplexBoolean() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/withIfElseExpression/complexBoolean.kt");
-            doTestWithSurroundWithIfElseExpression(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/withIfElseExpression/complexBoolean.kt");
         }
 
         @TestMetadata("replaceWithParenthesized.kt")
         public void testReplaceWithParenthesized() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/withIfElseExpression/replaceWithParenthesized.kt");
-            doTestWithSurroundWithIfElseExpression(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/withIfElseExpression/replaceWithParenthesized.kt");
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/withIfElseExpression/variable.kt");
-            doTestWithSurroundWithIfElseExpression(fileName);
+            runTest("idea/testData/codeInsight/surroundWith/withIfElseExpression/variable.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java

@@ -23,38 +23,37 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveExpression extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestExpressionRemover, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRemoveExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("ifInBlock.kt")
         public void testIfInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
-            doTestExpressionRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
         }
 
         @TestMetadata("ifInExpressionInReturn.kt")
         public void testIfInExpressionInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
-            doTestExpressionRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
         }
 
         @TestMetadata("ifInReturn.kt")
         public void testIfInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
-            doTestExpressionRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
         }
 
         @TestMetadata("tryInBlock.kt")
         public void testTryInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
-            doTestExpressionRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
         }
 
         @TestMetadata("tryInReturn.kt")
         public void testTryInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
-            doTestExpressionRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
         }
     }
 
@@ -62,26 +61,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapThen extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestThenUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapThen() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("thenCompoundInBlock.kt")
         public void testThenCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
-            doTestThenUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
         }
 
         @TestMetadata("thenCompoundInReturn.kt")
         public void testThenCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
-            doTestThenUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
         }
 
         @TestMetadata("thenSimpleInReturn.kt")
         public void testThenSimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
-            doTestThenUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
         }
     }
 
@@ -89,26 +89,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapElse extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestElseUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapElse() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("elseCompoundInBlock.kt")
         public void testElseCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
-            doTestElseUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
         }
 
         @TestMetadata("elseCompoundInReturn.kt")
         public void testElseCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
-            doTestElseUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
         }
 
         @TestMetadata("elseSimpleInReturn.kt")
         public void testElseSimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
-            doTestElseUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
         }
     }
 
@@ -116,14 +117,17 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveElse extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestElseRemover, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRemoveElse() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("else.kt")
         public void testElse() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
-            doTestElseRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
         }
     }
 
@@ -131,26 +135,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapLoop extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestLoopUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapLoop() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("doWhile.kt")
         public void testDoWhile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
-            doTestLoopUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
         }
 
         @TestMetadata("for.kt")
         public void testFor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
-            doTestLoopUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
         }
 
         @TestMetadata("while.kt")
         public void testWhile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
-            doTestLoopUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
         }
     }
 
@@ -158,26 +163,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapTry extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestTryUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapTry() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("tryCompoundInBlock.kt")
         public void testTryCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
-            doTestTryUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
         }
 
         @TestMetadata("tryCompoundInReturn.kt")
         public void testTryCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
-            doTestTryUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
         }
 
         @TestMetadata("trySimpleInReturn.kt")
         public void testTrySimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
-            doTestTryUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
         }
     }
 
@@ -185,26 +191,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapCatch extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestCatchUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapCatch() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("catchCompoundInBlock.kt")
         public void testCatchCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
-            doTestCatchUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
         }
 
         @TestMetadata("catchCompoundInReturn.kt")
         public void testCatchCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
-            doTestCatchUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
         }
 
         @TestMetadata("catchSimpleInReturn.kt")
         public void testCatchSimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
-            doTestCatchUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
         }
     }
 
@@ -212,14 +219,17 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveCatch extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestCatchRemover, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRemoveCatch() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("catch.kt")
         public void testCatch() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
-            doTestCatchRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
         }
     }
 
@@ -227,26 +237,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapFinally extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestFinallyUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapFinally() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("finallyCompoundInBlock.kt")
         public void testFinallyCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
-            doTestFinallyUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
         }
 
         @TestMetadata("finallyCompoundInReturn.kt")
         public void testFinallyCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
-            doTestFinallyUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
         }
 
         @TestMetadata("finallySimpleInReturn.kt")
         public void testFinallySimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
-            doTestFinallyUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
         }
     }
 
@@ -254,20 +265,22 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveFinally extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestFinallyRemover, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRemoveFinally() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("finallyInBlock.kt")
         public void testFinallyInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
-            doTestFinallyRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
         }
 
         @TestMetadata("finallyInReturn.kt")
         public void testFinallyInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
-            doTestFinallyRemover(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
         }
     }
 
@@ -275,68 +288,62 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapLambda extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestLambdaUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapLambda() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("lambdaCallCompoundInBlock.kt")
         public void testLambdaCallCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
         }
 
         @TestMetadata("lambdaCallCompoundInReturn.kt")
         public void testLambdaCallCompoundInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
         }
 
         @TestMetadata("lambdaCallInBlock.kt")
         public void testLambdaCallInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
         }
 
         @TestMetadata("lambdaCallInBlock2.kt")
         public void testLambdaCallInBlock2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
         }
 
         @TestMetadata("lambdaCallSimpleInReturn.kt")
         public void testLambdaCallSimpleInReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
         }
 
         @TestMetadata("lambdaInBlock.kt")
         public void testLambdaInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
         }
 
         @TestMetadata("lambdaNonLocalPropertyCompoundInBlock.kt")
         public void testLambdaNonLocalPropertyCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
         }
 
         @TestMetadata("lambdaNonLocalPropertyInBlock.kt")
         public void testLambdaNonLocalPropertyInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
         }
 
         @TestMetadata("lambdaPropertyCompoundInBlock.kt")
         public void testLambdaPropertyCompoundInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
         }
 
         @TestMetadata("lambdaPropertyInBlock.kt")
         public void testLambdaPropertyInBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
-            doTestLambdaUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
         }
     }
 
@@ -344,26 +351,27 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapFunctionParameter extends AbstractUnwrapRemoveTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestFunctionParameterUnwrapper, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUnwrapFunctionParameter() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("functionHasMultiParam.kt")
         public void testFunctionHasMultiParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionHasMultiParam.kt");
-            doTestFunctionParameterUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionHasMultiParam.kt");
         }
 
         @TestMetadata("functionHasSingleParam.kt")
         public void testFunctionHasSingleParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionHasSingleParam.kt");
-            doTestFunctionParameterUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionHasSingleParam.kt");
         }
 
         @TestMetadata("functionWithReceiver.kt")
         public void testFunctionWithReceiver() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionWithReceiver.kt");
-            doTestFunctionParameterUnwrapper(fileName);
+            runTest("idea/testData/codeInsight/unwrapAndRemove/unwrapFunctionParameter/functionWithReceiver.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java

@@ -21,46 +21,43 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("AddImports.java")
     public void testAddImports() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImports.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImports.java");
     }
 
     @TestMetadata("AddImportsButNoConversion.java")
     public void testAddImportsButNoConversion() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java");
     }
 
     @TestMetadata("AddImportsButNoConversion2.java")
     public void testAddImportsButNoConversion2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java");
     }
 
     @TestMetadata("AddImportsClassInSamePackage.java")
     public void testAddImportsClassInSamePackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java");
     }
 
     @TestMetadata("AddImportsDummyConflict.java")
     public void testAddImportsDummyConflict() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java");
     }
 
     @TestMetadata("AddImportsWithExplicitImports.java")
     public void testAddImportsWithExplicitImports() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java");
     }
 
     @TestMetadata("AddKClassImport.java")
     public void testAddKClassImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddKClassImport.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/AddKClassImport.java");
     }
 
     public void testAllFilesPresentInConversion() throws Exception {
@@ -69,187 +66,156 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
 
     @TestMetadata("Arithmetic.java")
     public void testArithmetic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Arithmetic.java");
     }
 
     @TestMetadata("ClassWithNoDocComment.java")
     public void testClassWithNoDocComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java");
     }
 
     @TestMetadata("ClassWithOverrides.java")
     public void testClassWithOverrides() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithOverrides.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/ClassWithOverrides.java");
     }
 
     @TestMetadata("Constructor.java")
     public void testConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Constructor.java");
     }
 
     @TestMetadata("ConversionInCorrectContext.java")
     public void testConversionInCorrectContext() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java");
     }
 
     @TestMetadata("CopyAnnotation.java")
     public void testCopyAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/CopyAnnotation.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/CopyAnnotation.java");
     }
 
     @TestMetadata("ExtendsTypeRef.java")
     public void testExtendsTypeRef() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/ExtendsTypeRef.java");
     }
 
     @TestMetadata("FieldWithNoEndComment.java")
     public void testFieldWithNoEndComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java");
     }
 
     @TestMetadata("FieldWithNoModifierAndNoSemicolon.java")
     public void testFieldWithNoModifierAndNoSemicolon() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java");
     }
 
     @TestMetadata("FileWithNoPackageStatement.java")
     public void testFileWithNoPackageStatement() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java");
     }
 
     @TestMetadata("HalfTheWhiteSpace.java")
     public void testHalfTheWhiteSpace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
     }
 
     @TestMetadata("ImplementsTypeRef.java")
     public void testImplementsTypeRef() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/ImplementsTypeRef.java");
     }
 
     @TestMetadata("Imports1.java")
     public void testImports1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Imports1.java");
     }
 
     @TestMetadata("Imports2.java")
     public void testImports2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Imports2.java");
     }
 
     @TestMetadata("Imports3.java")
     public void testImports3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Imports3.java");
     }
 
     @TestMetadata("Indentation.java")
     public void testIndentation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/Indentation.java");
     }
 
     @TestMetadata("InsertIntoComment.java")
     public void testInsertIntoComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/InsertIntoComment.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/InsertIntoComment.java");
     }
 
     @TestMetadata("InsertIntoString.java")
     public void testInsertIntoString() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/InsertIntoString.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/InsertIntoString.java");
     }
 
     @TestMetadata("MethodDeclarationWithNoBody.java")
     public void testMethodDeclarationWithNoBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java");
     }
 
     @TestMetadata("MethodReferenceWithoutQualifier.java")
     public void testMethodReferenceWithoutQualifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
     }
 
     @TestMetadata("MethodWithNoAnnotation.java")
     public void testMethodWithNoAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java");
     }
 
     @TestMetadata("MethodWithOnlyOneAnnotation.java")
     public void testMethodWithOnlyOneAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java");
     }
 
     @TestMetadata("OnlyClosingBrace.java")
     public void testOnlyClosingBrace() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
     }
 
     @TestMetadata("OnlyOneBraceFromBlock.java")
     public void testOnlyOneBraceFromBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
     }
 
     @TestMetadata("OnlyQualifier.java")
     public void testOnlyQualifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/OnlyQualifier.java");
     }
 
     @TestMetadata("RawTypeRef.java")
     public void testRawTypeRef() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/RawTypeRef.java");
     }
 
     @TestMetadata("RedundantTypeCast.java")
     public void testRedundantTypeCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/RedundantTypeCast.java");
     }
 
     @TestMetadata("RedundantTypeCast2.java")
     public void testRedundantTypeCast2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast2.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/RedundantTypeCast2.java");
     }
 
     @TestMetadata("SampleBlock.java")
     public void testSampleBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/SampleBlock.java");
     }
 
     @TestMetadata("SeveralMethodsSample.java")
     public void testSeveralMethodsSample() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
     }
 
     @TestMetadata("SingleWordFromIdentifier.java")
     public void testSingleWordFromIdentifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralKotlinToKotlinCopyPasteTestGenerated.java

@@ -21,43 +21,41 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class LiteralKotlinToKotlinCopyPasteTestGenerated extends AbstractLiteralKotlinToKotlinCopyPasteTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInLiteral() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/literal"), Pattern.compile("^([^\\.]+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("CollectionLiteralReference.kt")
     public void testCollectionLiteralReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/CollectionLiteralReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/CollectionLiteralReference.kt");
     }
 
     @TestMetadata("DontEscapeEntries.kt")
     public void testDontEscapeEntries() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/DontEscapeEntries.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/DontEscapeEntries.kt");
     }
 
     @TestMetadata("DontEscapeEntries2.kt")
     public void testDontEscapeEntries2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/DontEscapeEntries2.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/DontEscapeEntries2.kt");
     }
 
     @TestMetadata("DontEscapeThis.kt")
     public void testDontEscapeThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/DontEscapeThis.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/DontEscapeThis.kt");
     }
 
     @TestMetadata("DontUnescapeLiteralWIthCode.kt")
     public void testDontUnescapeLiteralWIthCode() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/DontUnescapeLiteralWIthCode.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/DontUnescapeLiteralWIthCode.kt");
     }
 
     @TestMetadata("UnescapeFullSelection.kt")
     public void testUnescapeFullSelection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/literal/UnescapeFullSelection.kt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/literal/UnescapeFullSelection.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralTextToKotlinCopyPasteTestGenerated.java

@@ -21,67 +21,61 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class LiteralTextToKotlinCopyPasteTestGenerated extends AbstractLiteralTextToKotlinCopyPasteTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInPlainTextLiteral() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/plainTextLiteral"), Pattern.compile("^([^\\.]+)\\.txt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("BrokenEntries.txt")
     public void testBrokenEntries() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/BrokenEntries.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/BrokenEntries.txt");
     }
 
     @TestMetadata("MultiLine.txt")
     public void testMultiLine() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/MultiLine.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/MultiLine.txt");
     }
 
     @TestMetadata("MultiLineToTripleQuotes.txt")
     public void testMultiLineToTripleQuotes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.txt");
     }
 
     @TestMetadata("MultiQuotesToTripleQuotes.txt")
     public void testMultiQuotesToTripleQuotes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/MultiQuotesToTripleQuotes.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/MultiQuotesToTripleQuotes.txt");
     }
 
     @TestMetadata("NoSpecialCharsToSingleQuote.txt")
     public void testNoSpecialCharsToSingleQuote() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/NoSpecialCharsToSingleQuote.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/NoSpecialCharsToSingleQuote.txt");
     }
 
     @TestMetadata("TrailingLines.txt")
     public void testTrailingLines() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/TrailingLines.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/TrailingLines.txt");
     }
 
     @TestMetadata("WithBackslashes.txt")
     public void testWithBackslashes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/WithBackslashes.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/WithBackslashes.txt");
     }
 
     @TestMetadata("WithDollarSignToTripleQuotes.txt")
     public void testWithDollarSignToTripleQuotes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/WithDollarSignToTripleQuotes.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/WithDollarSignToTripleQuotes.txt");
     }
 
     @TestMetadata("WithEntries.txt")
     public void testWithEntries() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/WithEntries.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/WithEntries.txt");
     }
 
     @TestMetadata("WithQuotes.txt")
     public void testWithQuotes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/WithQuotes.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextLiteral/WithQuotes.txt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/TextJavaToKotlinCopyPasteConversionTestGenerated.java

@@ -21,109 +21,96 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class TextJavaToKotlinCopyPasteConversionTestGenerated extends AbstractTextJavaToKotlinCopyPasteConversionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInPlainTextConversion() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/plainTextConversion"), Pattern.compile("^([^\\.]+)\\.txt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AsExpression.txt")
     public void testAsExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/AsExpression.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/AsExpression.txt");
     }
 
     @TestMetadata("AsExpressionBody.txt")
     public void testAsExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/AsExpressionBody.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/AsExpressionBody.txt");
     }
 
     @TestMetadata("ImportFromTarget.txt")
     public void testImportFromTarget() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/ImportFromTarget.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/ImportFromTarget.txt");
     }
 
     @TestMetadata("ImportResolve.txt")
     public void testImportResolve() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/ImportResolve.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/ImportResolve.txt");
     }
 
     @TestMetadata("InsideIdentifier.txt")
     public void testInsideIdentifier() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/InsideIdentifier.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/InsideIdentifier.txt");
     }
 
     @TestMetadata("IntoComment.txt")
     public void testIntoComment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/IntoComment.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/IntoComment.txt");
     }
 
     @TestMetadata("IntoRawStringLiteral.txt")
     public void testIntoRawStringLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.txt");
     }
 
     @TestMetadata("IntoStringLiteral.txt")
     public void testIntoStringLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.txt");
     }
 
     @TestMetadata("KT13529.txt")
     public void testKT13529() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/KT13529.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/KT13529.txt");
     }
 
     @TestMetadata("KT13529_1.txt")
     public void testKT13529_1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/KT13529_1.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/KT13529_1.txt");
     }
 
     @TestMetadata("MembersIntoClass.txt")
     public void testMembersIntoClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/MembersIntoClass.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/MembersIntoClass.txt");
     }
 
     @TestMetadata("MembersToTopLevel.txt")
     public void testMembersToTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.txt");
     }
 
     @TestMetadata("Override.txt")
     public void testOverride() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/Override.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/Override.txt");
     }
 
     @TestMetadata("OverrideInterface.txt")
     public void testOverrideInterface() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/OverrideInterface.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/OverrideInterface.txt");
     }
 
     @TestMetadata("PostProcessing.txt")
     public void testPostProcessing() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/PostProcessing.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/PostProcessing.txt");
     }
 
     @TestMetadata("StatementsIntoFunction.txt")
     public void testStatementsIntoFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/StatementsIntoFunction.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/StatementsIntoFunction.txt");
     }
 
     @TestMetadata("WholeFile.txt")
     public void testWholeFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextConversion/WholeFile.txt");
-        doTest(fileName);
+        runTest("idea/testData/copyPaste/plainTextConversion/WholeFile.txt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java

@@ -21,13 +21,16 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinCoverageOutputFilesTestGenerated extends AbstractKotlinCoverageOutputFilesTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInOutputFiles() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/coverage/outputFiles"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("NotInlinedLambda.kt")
     public void testNotInlinedLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/coverage/outputFiles/NotInlinedLambda.kt");
-        doTest(fileName);
+        runTest("idea/testData/coverage/outputFiles/NotInlinedLambda.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/BeforeExtractFunctionInsertionTestGenerated.java

@@ -21,37 +21,36 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class BeforeExtractFunctionInsertionTestGenerated extends AbstractBeforeExtractFunctionInsertionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInInsertBeforeExtractFunction() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/insertBeforeExtractFunction"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("emptyImportDirective.kt")
     public void testEmptyImportDirective() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt");
     }
 
     @TestMetadata("emptyImportDirective2.kt")
     public void testEmptyImportDirective2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt");
     }
 
     @TestMetadata("emptyPackageDirective.kt")
     public void testEmptyPackageDirective() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt");
     }
 
     @TestMetadata("emptyPackageDirective2.kt")
     public void testEmptyPackageDirective2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt");
     }
 
     @TestMetadata("manyImports.kt")
     public void testManyImports() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/PositionManagerTestGenerated.java

@@ -23,128 +23,112 @@ public class PositionManagerTestGenerated extends AbstractPositionManagerTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SingleFile extends AbstractPositionManagerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSingleFile() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("anonymousFunction.kt")
         public void testAnonymousFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/anonymousFunction.kt");
         }
 
         @TestMetadata("anonymousNamedFunction.kt")
         public void testAnonymousNamedFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousNamedFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/anonymousNamedFunction.kt");
         }
 
         @TestMetadata("class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/class.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/class.kt");
         }
 
         @TestMetadata("classObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/classObject.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/classObject.kt");
         }
 
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/enum.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/enum.kt");
         }
 
         @TestMetadata("extensionFunction.kt")
         public void testExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/extensionFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/extensionFunction.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteral.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/functionLiteral.kt");
         }
 
         @TestMetadata("functionLiteralInVal.kt")
         public void testFunctionLiteralInVal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteralInVal.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/functionLiteralInVal.kt");
         }
 
         @TestMetadata("innerClass.kt")
         public void testInnerClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/innerClass.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/innerClass.kt");
         }
 
         @TestMetadata("JvmNameAnnotation.kt")
         public void testJvmNameAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/JvmNameAnnotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/JvmNameAnnotation.kt");
         }
 
         @TestMetadata("localFunction.kt")
         public void testLocalFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/localFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/localFunction.kt");
         }
 
         @TestMetadata("objectDeclaration.kt")
         public void testObjectDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectDeclaration.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/objectDeclaration.kt");
         }
 
         @TestMetadata("objectExpression.kt")
         public void testObjectExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/objectExpression.kt");
         }
 
         @TestMetadata("package.kt")
         public void testPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/package.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/package.kt");
         }
 
         @TestMetadata("propertyAccessor.kt")
         public void testPropertyAccessor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyAccessor.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/propertyAccessor.kt");
         }
 
         @TestMetadata("propertyInitializer.kt")
         public void testPropertyInitializer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyInitializer.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/propertyInitializer.kt");
         }
 
         @TestMetadata("topLevelPropertyInitializer.kt")
         public void testTopLevelPropertyInitializer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt");
         }
 
         @TestMetadata("trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/trait.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/trait.kt");
         }
 
         @TestMetadata("twoClasses.kt")
         public void testTwoClasses() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/twoClasses.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/twoClasses.kt");
         }
 
         @TestMetadata("_DefaultPackage.kt")
         public void test_DefaultPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/_DefaultPackage.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/_DefaultPackage.kt");
         }
     }
 
@@ -152,20 +136,22 @@ public class PositionManagerTestGenerated extends AbstractPositionManagerTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MultiFile extends AbstractPositionManagerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInMultiFile() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("multiFilePackage")
         public void testMultiFilePackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFilePackage/");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/multiFilePackage/");
         }
 
         @TestMetadata("multiFileSameName")
         public void testMultiFileSameName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFileSameName/");
-            doTest(fileName);
+            runTest("idea/testData/debugger/positionManager/multiFileSameName/");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java

@@ -21,193 +21,166 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInSmartStepInto() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("annotation.kt")
     public void testAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/annotation.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/annotation.kt");
     }
 
     @TestMetadata("arrayAccess.kt")
     public void testArrayAccess() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/arrayAccess.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/arrayAccess.kt");
     }
 
     @TestMetadata("callChain.kt")
     public void testCallChain() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/callChain.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/callChain.kt");
     }
 
     @TestMetadata("constructor.kt")
     public void testConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/constructor.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/constructor.kt");
     }
 
     @TestMetadata("conventionMethod.kt")
     public void testConventionMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/conventionMethod.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/conventionMethod.kt");
     }
 
     @TestMetadata("delegatedPropertyGetter.kt")
     public void testDelegatedPropertyGetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt");
     }
 
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/doWhile.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/doWhile.kt");
     }
 
     @TestMetadata("dotQualified.kt")
     public void testDotQualified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualified.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/dotQualified.kt");
     }
 
     @TestMetadata("dotQualifiedInParam.kt")
     public void testDotQualifiedInParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt");
     }
 
     @TestMetadata("empty.kt")
     public void testEmpty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/empty.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/empty.kt");
     }
 
     @TestMetadata("for.kt")
     public void testFor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/for.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/for.kt");
     }
 
     @TestMetadata("funLiteral.kt")
     public void testFunLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/funLiteral.kt");
     }
 
     @TestMetadata("funWithExpressionBody.kt")
     public void testFunWithExpressionBody() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funWithExpressionBody.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/funWithExpressionBody.kt");
     }
 
     @TestMetadata("if.kt")
     public void testIf() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/if.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/if.kt");
     }
 
     @TestMetadata("infixCall.kt")
     public void testInfixCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/infixCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/infixCall.kt");
     }
 
     @TestMetadata("inlinedFunLiteral.kt")
     public void testInlinedFunLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunLiteral.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/inlinedFunLiteral.kt");
     }
 
     @TestMetadata("inlinedFunctionalExpression.kt")
     public void testInlinedFunctionalExpression() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunctionalExpression.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/inlinedFunctionalExpression.kt");
     }
 
     @TestMetadata("invoke.kt")
     public void testInvoke() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/invoke.kt");
     }
 
     @TestMetadata("libraryFun.kt")
     public void testLibraryFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/libraryFun.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/libraryFun.kt");
     }
 
     @TestMetadata("multiline.kt")
     public void testMultiline() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multiline.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/multiline.kt");
     }
 
     @TestMetadata("multilineCallChain.kt")
     public void testMultilineCallChain() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multilineCallChain.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/multilineCallChain.kt");
     }
 
     @TestMetadata("object.kt")
     public void testObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/object.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/object.kt");
     }
 
     @TestMetadata("param.kt")
     public void testParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/param.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/param.kt");
     }
 
     @TestMetadata("parantesized.kt")
     public void testParantesized() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/parantesized.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/parantesized.kt");
     }
 
     @TestMetadata("propertyGetter.kt")
     public void testPropertyGetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/propertyGetter.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/propertyGetter.kt");
     }
 
     @TestMetadata("renderer.kt")
     public void testRenderer() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/renderer.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/renderer.kt");
     }
 
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/simple.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/simple.kt");
     }
 
     @TestMetadata("stringTemplate.kt")
     public void testStringTemplate() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/stringTemplate.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/stringTemplate.kt");
     }
 
     @TestMetadata("unary.kt")
     public void testUnary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/unary.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/unary.kt");
     }
 
     @TestMetadata("when.kt")
     public void testWhen() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/when.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/when.kt");
     }
 
     @TestMetadata("while.kt")
     public void testWhile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/while.kt");
-        doTest(fileName);
+        runTest("idea/testData/debugger/smartStepInto/while.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentAutoImportTestGenerated.java

@@ -21,13 +21,16 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CodeFragmentAutoImportTestGenerated extends AbstractCodeFragmentAutoImportTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInCodeFragmentAutoImport() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix.special/codeFragmentAutoImport"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("ExtensionFun.kt")
     public void testExtensionFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix.special/codeFragmentAutoImport/ExtensionFun.kt");
-        doTest(fileName);
+        runTest("idea/testData/quickfix.special/codeFragmentAutoImport/ExtensionFun.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java

@@ -21,43 +21,41 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CodeFragmentCompletionHandlerTestGenerated extends AbstractCodeFragmentCompletionHandlerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInRuntimeCast() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/runtimeCast"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("CastPrivateFun.kt")
     public void testCastPrivateFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPrivateFun.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/CastPrivateFun.kt");
     }
 
     @TestMetadata("CastPropertyWithSmartCast.kt")
     public void testCastPropertyWithSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPropertyWithSmartCast.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/CastPropertyWithSmartCast.kt");
     }
 
     @TestMetadata("InsertExtFunction.kt")
     public void testInsertExtFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertExtFunction.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/InsertExtFunction.kt");
     }
 
     @TestMetadata("InsertFunction.kt")
     public void testInsertFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertFunction.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/InsertFunction.kt");
     }
 
     @TestMetadata("InsertImport.kt")
     public void testInsertImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt");
     }
 
     @TestMetadata("NotImportedExtension.kt")
     public void testNotImportedExtension() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/NotImportedExtension.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/handlers/runtimeCast/NotImportedExtension.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java

@@ -21,112 +21,104 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInCodeFragments() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("blockCodeFragment.kt")
     public void testBlockCodeFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/blockCodeFragment.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/blockCodeFragment.kt");
     }
 
     @TestMetadata("classHeader.kt")
     public void testClassHeader() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/classHeader.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/classHeader.kt");
     }
 
     @TestMetadata("elementAt.kt")
     public void testElementAt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAt.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/elementAt.kt");
     }
 
     @TestMetadata("elementAtFirstInBlock.kt")
     public void testElementAtFirstInBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAtFirstInBlock.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/elementAtFirstInBlock.kt");
     }
 
     @TestMetadata("localVal.kt")
     public void testLocalVal() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVal.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/localVal.kt");
     }
 
     @TestMetadata("localVariables.kt")
     public void testLocalVariables() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariables.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/localVariables.kt");
     }
 
     @TestMetadata("localVariablesOnReturn.kt")
     public void testLocalVariablesOnReturn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariablesOnReturn.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/localVariablesOnReturn.kt");
     }
 
     @TestMetadata("noDuplicatesForSyntheticProperties.kt")
     public void testNoDuplicatesForSyntheticProperties() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/noDuplicatesForSyntheticProperties.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/noDuplicatesForSyntheticProperties.kt");
     }
 
     @TestMetadata("privatesInSecondPressCompletion.kt")
     public void testPrivatesInSecondPressCompletion() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/privatesInSecondPressCompletion.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/privatesInSecondPressCompletion.kt");
     }
 
     @TestMetadata("topLevel.kt")
     public void testTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/topLevel.kt");
-        doTest(fileName);
+        runTest("idea/idea-completion/testData/basic/codeFragments/topLevel.kt");
     }
 
     @TestMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RuntimeType extends AbstractCodeFragmentCompletionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInRuntimeType() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments/runtimeType"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("castWithGenerics.kt")
         public void testCastWithGenerics() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt");
         }
 
         @TestMetadata("complexHierarchy.kt")
         public void testComplexHierarchy() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt");
         }
 
         @TestMetadata("extensionMethod.kt")
         public void testExtensionMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt");
         }
 
         @TestMetadata("notImportedExtension.kt")
         public void testNotImportedExtension() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/notImportedExtension.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/notImportedExtension.kt");
         }
 
         @TestMetadata("runtimeCast.kt")
         public void testRuntimeCast() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt");
         }
 
         @TestMetadata("smartCompletion.kt")
         public void testSmartCompletion() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/smartCompletion.kt");
-            doTest(fileName);
+            runTest("idea/idea-completion/testData/basic/codeFragments/runtimeType/smartCompletion.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java

@@ -23,152 +23,132 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CodeFragments extends AbstractCodeFragmentHighlightingTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCodeFragments() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("anonymousObject.kt")
         public void testAnonymousObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/anonymousObject.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/anonymousObject.kt");
         }
 
         @TestMetadata("binaryExpression.kt")
         public void testBinaryExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/binaryExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/binaryExpression.kt");
         }
 
         @TestMetadata("blockCodeFragment.kt")
         public void testBlockCodeFragment() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/blockCodeFragment.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/blockCodeFragment.kt");
         }
 
         @TestMetadata("callExpression.kt")
         public void testCallExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/callExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/callExpression.kt");
         }
 
         @TestMetadata("classHeader.kt")
         public void testClassHeader() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/classHeader.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/classHeader.kt");
         }
 
         @TestMetadata("classHeaderWithTypeArguments.kt")
         public void testClassHeaderWithTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt");
         }
 
         @TestMetadata("contextElementAsStatement.kt")
         public void testContextElementAsStatement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/contextElementAsStatement.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/contextElementAsStatement.kt");
         }
 
         @TestMetadata("elementAtIfWithoutBraces.kt")
         public void testElementAtIfWithoutBraces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/elementAtIfWithoutBraces.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/elementAtIfWithoutBraces.kt");
         }
 
         @TestMetadata("elementAtWhenBranch.kt")
         public void testElementAtWhenBranch() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/elementAtWhenBranch.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/elementAtWhenBranch.kt");
         }
 
         @TestMetadata("localVariables.kt")
         public void testLocalVariables() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/localVariables.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/localVariables.kt");
         }
 
         @TestMetadata("localVariablesOnReturn.kt")
         public void testLocalVariablesOnReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/localVariablesOnReturn.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/localVariablesOnReturn.kt");
         }
 
         @TestMetadata("primaryConstructor.kt")
         public void testPrimaryConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/primaryConstructor.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/primaryConstructor.kt");
         }
 
         @TestMetadata("primaryConstructorLocal.kt")
         public void testPrimaryConstructorLocal() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/primaryConstructorLocal.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/primaryConstructorLocal.kt");
         }
 
         @TestMetadata("privateFunArgumentsResolve.kt")
         public void testPrivateFunArgumentsResolve() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateFunArgumentsResolve.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/privateFunArgumentsResolve.kt");
         }
 
         @TestMetadata("privateFunTypeArguments.kt")
         public void testPrivateFunTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateFunTypeArguments.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/privateFunTypeArguments.kt");
         }
 
         @TestMetadata("privateMember.kt")
         public void testPrivateMember() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateMember.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/privateMember.kt");
         }
 
         @TestMetadata("protectedMember.kt")
         public void testProtectedMember() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/protectedMember.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/protectedMember.kt");
         }
 
         @TestMetadata("secondaryConstructor.kt")
         public void testSecondaryConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/secondaryConstructor.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/secondaryConstructor.kt");
         }
 
         @TestMetadata("secondaryConstructorWithoutBraces.kt")
         public void testSecondaryConstructorWithoutBraces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/secondaryConstructorWithoutBraces.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/secondaryConstructorWithoutBraces.kt");
         }
 
         @TestMetadata("simpleNameExpression.kt")
         public void testSimpleNameExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/simpleNameExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/simpleNameExpression.kt");
         }
 
         @TestMetadata("smartCasts.kt")
         public void testSmartCasts() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/smartCasts.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/smartCasts.kt");
         }
 
         @TestMetadata("startingFromReturn.kt")
         public void testStartingFromReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/startingFromReturn.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/startingFromReturn.kt");
         }
 
         @TestMetadata("withoutBodyFunction.kt")
         public void testWithoutBodyFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/withoutBodyFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/withoutBodyFunction.kt");
         }
 
         @TestMetadata("withoutBodyProperty.kt")
         public void testWithoutBodyProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/withoutBodyProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/checker/codeFragments/withoutBodyProperty.kt");
         }
     }
 
@@ -176,14 +156,17 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Imports extends AbstractCodeFragmentHighlightingTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithImport, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInImports() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments/imports"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/codeFragments/imports/hashMap.kt");
-            doTestWithImport(fileName);
+            runTest("idea/testData/checker/codeFragments/imports/hashMap.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java

@@ -23,230 +23,197 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SelectExpression extends AbstractSelectExpressionForDebuggerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSelectExpression() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("annotation.kt")
         public void testAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/annotation.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/annotation.kt");
         }
 
         @TestMetadata("binaryExpression.kt")
         public void testBinaryExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/binaryExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/binaryExpression.kt");
         }
 
         @TestMetadata("call.kt")
         public void testCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/call.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/call.kt");
         }
 
         @TestMetadata("companionObjectCall.kt")
         public void testCompanionObjectCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/companionObjectCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/companionObjectCall.kt");
         }
 
         @TestMetadata("companionObjectCall2.kt")
         public void testCompanionObjectCall2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/companionObjectCall2.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/companionObjectCall2.kt");
         }
 
         @TestMetadata("expressionInPropertyInitializer.kt")
         public void testExpressionInPropertyInitializer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt");
         }
 
         @TestMetadata("extensionFun.kt")
         public void testExtensionFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/extensionFun.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/extensionFun.kt");
         }
 
         @TestMetadata("firstCallInChain.kt")
         public void testFirstCallInChain() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/firstCallInChain.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/firstCallInChain.kt");
         }
 
         @TestMetadata("fullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/fullyQualified.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/fullyQualified.kt");
         }
 
         @TestMetadata("funArgument.kt")
         public void testFunArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/funArgument.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/funArgument.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/functionLiteral.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/functionLiteral.kt");
         }
 
         @TestMetadata("getConvention.kt")
         public void testGetConvention() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/getConvention.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/getConvention.kt");
         }
 
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/imports.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/imports.kt");
         }
 
         @TestMetadata("infixCall.kt")
         public void testInfixCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/infixCall.kt");
         }
 
         @TestMetadata("infixCallArgument.kt")
         public void testInfixCallArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCallArgument.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/infixCallArgument.kt");
         }
 
         @TestMetadata("isExpression.kt")
         public void testIsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/isExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/isExpression.kt");
         }
 
         @TestMetadata("javaStaticMehtodCall.kt")
         public void testJavaStaticMehtodCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/javaStaticMehtodCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/javaStaticMehtodCall.kt");
         }
 
         @TestMetadata("keyword.kt")
         public void testKeyword() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/keyword.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/keyword.kt");
         }
 
         @TestMetadata("modifier.kt")
         public void testModifier() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/modifier.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/modifier.kt");
         }
 
         @TestMetadata("nameArgument.kt")
         public void testNameArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/nameArgument.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/nameArgument.kt");
         }
 
         @TestMetadata("objectMethodCall.kt")
         public void testObjectMethodCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/objectMethodCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/objectMethodCall.kt");
         }
 
         @TestMetadata("package.kt")
         public void testPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/package.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/package.kt");
         }
 
         @TestMetadata("param.kt")
         public void testParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/param.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/param.kt");
         }
 
         @TestMetadata("propertyCall.kt")
         public void testPropertyCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/propertyCall.kt");
         }
 
         @TestMetadata("propertyDeclaration.kt")
         public void testPropertyDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyDeclaration.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/propertyDeclaration.kt");
         }
 
         @TestMetadata("qualifiedExpressionProperty.kt")
         public void testQualifiedExpressionProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt");
         }
 
         @TestMetadata("qualifiedExpressionReceiver.kt")
         public void testQualifiedExpressionReceiver() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt");
         }
 
         @TestMetadata("qualifiedExpressionSelector.kt")
         public void testQualifiedExpressionSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt");
         }
 
         @TestMetadata("super.kt")
         public void testSuper() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/super.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/super.kt");
         }
 
         @TestMetadata("superSelector.kt")
         public void testSuperSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/superSelector.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/superSelector.kt");
         }
 
         @TestMetadata("this.kt")
         public void testThis() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/this.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/this.kt");
         }
 
         @TestMetadata("thisSelector.kt")
         public void testThisSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/thisSelector.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/thisSelector.kt");
         }
 
         @TestMetadata("thisWithLabel.kt")
         public void testThisWithLabel() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/thisWithLabel.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/thisWithLabel.kt");
         }
 
         @TestMetadata("unaryExpression.kt")
         public void testUnaryExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/unaryExpression.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/unaryExpression.kt");
         }
 
         @TestMetadata("userType.kt")
         public void testUserType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userType.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/userType.kt");
         }
 
         @TestMetadata("userTypeGeneric.kt")
         public void testUserTypeGeneric() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeGeneric.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/userTypeGeneric.kt");
         }
 
         @TestMetadata("userTypeQualified.kt")
         public void testUserTypeQualified() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeQualified.kt");
-            doTest(fileName);
+            runTest("idea/testData/debugger/selectExpression/userTypeQualified.kt");
         }
     }
 
@@ -254,128 +221,112 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DisallowMethodCalls extends AbstractSelectExpressionForDebuggerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWoMethodCalls, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInDisallowMethodCalls() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression/disallowMethodCalls"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("binaryExpression.kt")
         public void testBinaryExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/binaryExpression.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/binaryExpression.kt");
         }
 
         @TestMetadata("call.kt")
         public void testCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/call.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/call.kt");
         }
 
         @TestMetadata("expressionInPropertyInitializer.kt")
         public void testExpressionInPropertyInitializer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/expressionInPropertyInitializer.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/expressionInPropertyInitializer.kt");
         }
 
         @TestMetadata("extensionFun.kt")
         public void testExtensionFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/extensionFun.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/extensionFun.kt");
         }
 
         @TestMetadata("funArgument.kt")
         public void testFunArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/funArgument.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/funArgument.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/functionLiteral.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/functionLiteral.kt");
         }
 
         @TestMetadata("getConvention.kt")
         public void testGetConvention() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/getConvention.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/getConvention.kt");
         }
 
         @TestMetadata("infixCall.kt")
         public void testInfixCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCall.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCall.kt");
         }
 
         @TestMetadata("infixCallArgument.kt")
         public void testInfixCallArgument() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCallArgument.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCallArgument.kt");
         }
 
         @TestMetadata("isExpression.kt")
         public void testIsExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/isExpression.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/isExpression.kt");
         }
 
         @TestMetadata("propertyCall.kt")
         public void testPropertyCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/propertyCall.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/propertyCall.kt");
         }
 
         @TestMetadata("qualifiedExpressionProperty.kt")
         public void testQualifiedExpressionProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionProperty.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionProperty.kt");
         }
 
         @TestMetadata("qualifiedExpressionReceiver.kt")
         public void testQualifiedExpressionReceiver() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionReceiver.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionReceiver.kt");
         }
 
         @TestMetadata("qualifiedExpressionSelector.kt")
         public void testQualifiedExpressionSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionSelector.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionSelector.kt");
         }
 
         @TestMetadata("super.kt")
         public void testSuper() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/super.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/super.kt");
         }
 
         @TestMetadata("superSelector.kt")
         public void testSuperSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/superSelector.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/superSelector.kt");
         }
 
         @TestMetadata("this.kt")
         public void testThis() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/this.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/this.kt");
         }
 
         @TestMetadata("thisSelector.kt")
         public void testThisSelector() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/thisSelector.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/thisSelector.kt");
         }
 
         @TestMetadata("thisWithLabel.kt")
         public void testThisWithLabel() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/thisWithLabel.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/thisWithLabel.kt");
         }
 
         @TestMetadata("unaryExpression.kt")
         public void testUnaryExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/unaryExpression.kt");
-            doTestWoMethodCalls(fileName);
+            runTest("idea/testData/debugger/selectExpression/disallowMethodCalls/unaryExpression.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTestGenerated.java

@@ -21,97 +21,86 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class NavigateToDecompiledLibraryTestGenerated extends AbstractNavigateToDecompiledLibraryTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInUsercode() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("ClassObject.kt")
     public void testClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
     }
 
     @TestMetadata("Constructor.kt")
     public void testConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/Constructor.kt");
     }
 
     @TestMetadata("Enum.kt")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/Enum.kt");
     }
 
     @TestMetadata("ExtensionFunction.kt")
     public void testExtensionFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
     }
 
     @TestMetadata("ExtensionProperty.kt")
     public void testExtensionProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
     }
 
     @TestMetadata("GenericFunctionWithExplicitlyDeclaredTypeArguments.kt")
     public void testGenericFunctionWithExplicitlyDeclaredTypeArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
     }
 
     @TestMetadata("GenericFunctionWithInferredTypeArguments.kt")
     public void testGenericFunctionWithInferredTypeArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
     }
 
     @TestMetadata("GlobalFunction.kt")
     public void testGlobalFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
     }
 
     @TestMetadata("GlobalProperty.kt")
     public void testGlobalProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
     }
 
     @TestMetadata("NamedObject.kt")
     public void testNamedObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
     }
 
     @TestMetadata("OverloadedFunWithTypeParam.kt")
     public void testOverloadedFunWithTypeParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
     }
 
     @TestMetadata("Property.kt")
     public void testProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/Property.kt");
     }
 
     @TestMetadata("SameNameInDifferentSources.kt")
     public void testSameNameInDifferentSources() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
     }
 
     @TestMetadata("TypeAlias.kt")
     public void testTypeAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
     }
 
     @TestMetadata("TypeWithSameShortName.kt")
     public void testTypeWithSameShortName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java

@@ -23,98 +23,87 @@ public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibr
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Usercode extends AbstractNavigateToLibrarySourceTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUsercode() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Constructor.kt");
         }
 
         @TestMetadata("Enum.kt")
         public void testEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Enum.kt");
         }
 
         @TestMetadata("ExtensionFunction.kt")
         public void testExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
         }
 
         @TestMetadata("ExtensionProperty.kt")
         public void testExtensionProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
         }
 
         @TestMetadata("GenericFunctionWithExplicitlyDeclaredTypeArguments.kt")
         public void testGenericFunctionWithExplicitlyDeclaredTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
         }
 
         @TestMetadata("GenericFunctionWithInferredTypeArguments.kt")
         public void testGenericFunctionWithInferredTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
         }
 
         @TestMetadata("GlobalFunction.kt")
         public void testGlobalFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
         }
 
         @TestMetadata("GlobalProperty.kt")
         public void testGlobalProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
         }
 
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
         }
 
         @TestMetadata("OverloadedFunWithTypeParam.kt")
         public void testOverloadedFunWithTypeParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Property.kt");
         }
 
         @TestMetadata("SameNameInDifferentSources.kt")
         public void testSameNameInDifferentSources() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
         }
 
         @TestMetadata("TypeAlias.kt")
         public void testTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
         }
 
         @TestMetadata("TypeWithSameShortName.kt")
         public void testTypeWithSameShortName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
-            doTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
         }
     }
 
@@ -122,98 +111,87 @@ public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibr
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UsercodeWithJSModule extends AbstractNavigateToLibrarySourceTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doWithJSModuleTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInUsercodeWithJSModule() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ClassObject.kt");
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Constructor.kt");
         }
 
         @TestMetadata("Enum.kt")
         public void testEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Enum.kt");
         }
 
         @TestMetadata("ExtensionFunction.kt")
         public void testExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt");
         }
 
         @TestMetadata("ExtensionProperty.kt")
         public void testExtensionProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt");
         }
 
         @TestMetadata("GenericFunctionWithExplicitlyDeclaredTypeArguments.kt")
         public void testGenericFunctionWithExplicitlyDeclaredTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt");
         }
 
         @TestMetadata("GenericFunctionWithInferredTypeArguments.kt")
         public void testGenericFunctionWithInferredTypeArguments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt");
         }
 
         @TestMetadata("GlobalFunction.kt")
         public void testGlobalFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt");
         }
 
         @TestMetadata("GlobalProperty.kt")
         public void testGlobalProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt");
         }
 
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/NamedObject.kt");
         }
 
         @TestMetadata("OverloadedFunWithTypeParam.kt")
         public void testOverloadedFunWithTypeParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt");
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/Property.kt");
         }
 
         @TestMetadata("SameNameInDifferentSources.kt")
         public void testSameNameInDifferentSources() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt");
         }
 
         @TestMetadata("TypeAlias.kt")
         public void testTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/TypeAlias.kt");
         }
 
         @TestMetadata("TypeWithSameShortName.kt")
         public void testTypeWithSameShortName() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
-            doWithJSModuleTest(fileName);
+            runTest("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java

@@ -21,211 +21,181 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInStubBuilder() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/stubBuilder"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("AnnotatedFlexibleTypes")
     public void testAnnotatedFlexibleTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/");
     }
 
     @TestMetadata("AnnotationClass")
     public void testAnnotationClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotationClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/AnnotationClass/");
     }
 
     @TestMetadata("Annotations")
     public void testAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Annotations/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Annotations/");
     }
 
     @TestMetadata("AnnotationsOnNullableTypes")
     public void testAnnotationsOnNullableTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/");
     }
 
     @TestMetadata("AnnotationsOnParenthesizedTypes")
     public void testAnnotationsOnParenthesizedTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/");
     }
 
     @TestMetadata("AnonymousReturnWithGenericType")
     public void testAnonymousReturnWithGenericType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/");
     }
 
     @TestMetadata("ClassMembers")
     public void testClassMembers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassMembers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/ClassMembers/");
     }
 
     @TestMetadata("ClassObject")
     public void testClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/ClassObject/");
     }
 
     @TestMetadata("Const")
     public void testConst() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Const/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Const/");
     }
 
     @TestMetadata("DataClass")
     public void testDataClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DataClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/DataClass/");
     }
 
     @TestMetadata("Delegation")
     public void testDelegation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Delegation/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Delegation/");
     }
 
     @TestMetadata("DependencyOnNestedClasses")
     public void testDependencyOnNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/");
     }
 
     @TestMetadata("Enum")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Enum/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Enum/");
     }
 
     @TestMetadata("FlexibleTypes")
     public void testFlexibleTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/FlexibleTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/FlexibleTypes/");
     }
 
     @TestMetadata("InheritingClasses")
     public void testInheritingClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/InheritingClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/InheritingClasses/");
     }
 
     @TestMetadata("InnerTypes")
     public void testInnerTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/InnerTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/InnerTypes/");
     }
 
     @TestMetadata("LocalClass")
     public void testLocalClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/LocalClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/LocalClass/");
     }
 
     @TestMetadata("Modifiers")
     public void testModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Modifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Modifiers/");
     }
 
     @TestMetadata("MultifileClass")
     public void testMultifileClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/MultifileClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/MultifileClass/");
     }
 
     @TestMetadata("NamedCompanionObject")
     public void testNamedCompanionObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NamedCompanionObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/NamedCompanionObject/");
     }
 
     @TestMetadata("NestedClasses")
     public void testNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/NestedClasses/");
     }
 
     @TestMetadata("Objects")
     public void testObjects() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Objects/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Objects/");
     }
 
     @TestMetadata("PrivateToThis")
     public void testPrivateToThis() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/PrivateToThis/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/PrivateToThis/");
     }
 
     @TestMetadata("Sealed")
     public void testSealed() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Sealed/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Sealed/");
     }
 
     @TestMetadata("SecondaryConstructors")
     public void testSecondaryConstructors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/SecondaryConstructors/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/SecondaryConstructors/");
     }
 
     @TestMetadata("SuspendLambda")
     public void testSuspendLambda() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/SuspendLambda/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/SuspendLambda/");
     }
 
     @TestMetadata("TopJvmPackageName")
     public void testTopJvmPackageName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopJvmPackageName/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TopJvmPackageName/");
     }
 
     @TestMetadata("TopLevelMembersAnnotatedKt")
     public void testTopLevelMembersAnnotatedKt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/");
     }
 
     @TestMetadata("TopLevelMembersKt")
     public void testTopLevelMembersKt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersKt/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TopLevelMembersKt/");
     }
 
     @TestMetadata("TypeAliases")
     public void testTypeAliases() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeAliases/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TypeAliases/");
     }
 
     @TestMetadata("TypeBoundsAndDelegationSpecifiers")
     public void testTypeBoundsAndDelegationSpecifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/");
     }
 
     @TestMetadata("TypeModifiers")
     public void testTypeModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeModifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TypeModifiers/");
     }
 
     @TestMetadata("TypeParams")
     public void testTypeParams() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeParams/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/TypeParams/");
     }
 
     @TestMetadata("Types")
     public void testTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Types/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/stubBuilder/Types/");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java

@@ -23,14 +23,16 @@ import java.util.regex.Pattern;
 public class CommonDecompiledTextFromJsMetadataTestGenerated extends AbstractCommonDecompiledTextFromJsMetadataTest {
     @TestMetadata("LocalClassAsTypeWithArgument")
     public void ignoreLocalClassAsTypeWithArgument() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/");
     }
 
     @TestMetadata("SecondaryConstructors")
     public void ignoreSecondaryConstructors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/SecondaryConstructors/");
+    }
+
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
     }
 
     public void testAllFilesPresentInDecompiledText() throws Exception {
@@ -39,103 +41,346 @@ public class CommonDecompiledTextFromJsMetadataTestGenerated extends AbstractCom
 
     @TestMetadata("AnnotatedEnumEntry")
     public void testAnnotatedEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry/");
     }
 
     @TestMetadata("Annotations")
     public void testAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Annotations/");
     }
 
     @TestMetadata("AnnotationsOnPrimaryCtr")
     public void testAnnotationsOnPrimaryCtr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/");
     }
 
     @TestMetadata("ClassWithClassObject")
     public void testClassWithClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/ClassWithClassObject/");
     }
 
     @TestMetadata("ClassWithNamedClassObject")
     public void testClassWithNamedClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/");
     }
 
     @TestMetadata("Const")
     public void testConst() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Const/");
     }
 
     @TestMetadata("DependencyOnNestedClasses")
     public void testDependencyOnNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/");
     }
 
     @TestMetadata("Enum")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Enum/");
     }
 
     @TestMetadata("FunctionTypes")
     public void testFunctionTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/FunctionTypes/");
     }
 
     @TestMetadata("FunctionalTypeWithNamedArguments")
     public void testFunctionalTypeWithNamedArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments/");
     }
 
     @TestMetadata("Inherited")
     public void testInherited() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Inherited/");
     }
 
     @TestMetadata("InnerClasses")
     public void testInnerClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/InnerClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/InnerClasses/");
     }
 
     @TestMetadata("Modifiers")
     public void testModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Modifiers/");
     }
 
     @TestMetadata("NestedClasses")
     public void testNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/NestedClasses/");
     }
 
     @TestMetadata("Object")
     public void testObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Object/");
     }
 
     @TestMetadata("SimpleClass")
     public void testSimpleClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/SimpleClass/");
     }
 
     @TestMetadata("TypeModifiers")
     public void testTypeModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/TypeModifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/TypeModifiers/");
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AnnotatedEnumEntry extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotatedEnumEntry() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Annotations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Annotations extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Annotations"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AnnotationsOnPrimaryCtr extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotationsOnPrimaryCtr() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ClassWithClassObject extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClassWithClassObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/ClassWithClassObject"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ClassWithNamedClassObject extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClassWithNamedClassObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Const")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Const extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInConst() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Const"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DependencyOnNestedClasses extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDependencyOnNestedClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Enum")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Enum extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInEnum() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Enum"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FlexibleTypes extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFlexibleTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FlexibleTypes"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FunctionTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FunctionTypes extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunctionTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FunctionTypes"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FunctionalTypeWithNamedArguments extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunctionalTypeWithNamedArguments() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Inherited")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Inherited extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInherited() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Inherited"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/InnerClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerClasses extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/InnerClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class LocalClassAsTypeWithArgument extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInLocalClassAsTypeWithArgument() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Modifiers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Modifiers extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInModifiers() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Modifiers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/NestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NestedClasses extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNestedClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/NestedClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Object")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Object extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Object"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SecondaryConstructors extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSecondaryConstructors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/SecondaryConstructors"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/SimpleClass")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SimpleClass extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSimpleClass() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/SimpleClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/TypeModifiers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeModifiers extends AbstractCommonDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeModifiers() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/TypeModifiers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java

@@ -21,127 +21,371 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CommonDecompiledTextTestGenerated extends AbstractCommonDecompiledTextTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInDecompiledText() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AnnotatedEnumEntry")
     public void testAnnotatedEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry/");
     }
 
     @TestMetadata("Annotations")
     public void testAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Annotations/");
     }
 
     @TestMetadata("AnnotationsOnPrimaryCtr")
     public void testAnnotationsOnPrimaryCtr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/");
     }
 
     @TestMetadata("ClassWithClassObject")
     public void testClassWithClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/ClassWithClassObject/");
     }
 
     @TestMetadata("ClassWithNamedClassObject")
     public void testClassWithNamedClassObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/");
     }
 
     @TestMetadata("Const")
     public void testConst() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Const/");
     }
 
     @TestMetadata("DependencyOnNestedClasses")
     public void testDependencyOnNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/");
     }
 
     @TestMetadata("Enum")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Enum/");
     }
 
     @TestMetadata("FlexibleTypes")
     public void testFlexibleTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/FlexibleTypes/");
     }
 
     @TestMetadata("FunctionTypes")
     public void testFunctionTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/FunctionTypes/");
     }
 
     @TestMetadata("FunctionalTypeWithNamedArguments")
     public void testFunctionalTypeWithNamedArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments/");
     }
 
     @TestMetadata("Inherited")
     public void testInherited() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Inherited/");
     }
 
     @TestMetadata("InnerClasses")
     public void testInnerClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/InnerClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/InnerClasses/");
     }
 
     @TestMetadata("LocalClassAsTypeWithArgument")
     public void testLocalClassAsTypeWithArgument() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/");
     }
 
     @TestMetadata("Modifiers")
     public void testModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Modifiers/");
     }
 
     @TestMetadata("NestedClasses")
     public void testNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/NestedClasses/");
     }
 
     @TestMetadata("Object")
     public void testObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/Object/");
     }
 
     @TestMetadata("SecondaryConstructors")
     public void testSecondaryConstructors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/SecondaryConstructors/");
     }
 
     @TestMetadata("SimpleClass")
     public void testSimpleClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/SimpleClass/");
     }
 
     @TestMetadata("TypeModifiers")
     public void testTypeModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/TypeModifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledText/TypeModifiers/");
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AnnotatedEnumEntry extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotatedEnumEntry() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/AnnotatedEnumEntry"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Annotations")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Annotations extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotations() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Annotations"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AnnotationsOnPrimaryCtr extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInAnnotationsOnPrimaryCtr() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ClassWithClassObject extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClassWithClassObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/ClassWithClassObject"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ClassWithNamedClassObject extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInClassWithNamedClassObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Const")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Const extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInConst() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Const"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DependencyOnNestedClasses extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDependencyOnNestedClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Enum")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Enum extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInEnum() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Enum"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FlexibleTypes extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFlexibleTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FlexibleTypes"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FunctionTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FunctionTypes extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunctionTypes() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FunctionTypes"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FunctionalTypeWithNamedArguments extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInFunctionalTypeWithNamedArguments() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/FunctionalTypeWithNamedArguments"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Inherited")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Inherited extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInherited() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Inherited"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/InnerClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InnerClasses extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInInnerClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/InnerClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class LocalClassAsTypeWithArgument extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInLocalClassAsTypeWithArgument() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Modifiers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Modifiers extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInModifiers() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Modifiers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/NestedClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class NestedClasses extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInNestedClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/NestedClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/Object")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Object extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInObject() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/Object"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SecondaryConstructors extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSecondaryConstructors() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/SecondaryConstructors"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/SimpleClass")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class SimpleClass extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInSimpleClass() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/SimpleClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledText/TypeModifiers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeModifiers extends AbstractCommonDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeModifiers() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText/TypeModifiers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java

@@ -21,19 +21,47 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JsDecompiledTextFromJsMetadataTestGenerated extends AbstractJsDecompiledTextFromJsMetadataTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+    }
+
     public void testAllFilesPresentInDecompiledTextJs() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJs"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
     }
 
     @TestMetadata("TestPackage")
     public void testTestPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJs/TestPackage/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJs/TestPackage/");
     }
 
     @TestMetadata("TypeAliases")
     public void testTypeAliases() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJs/TypeAliases/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJs/TypeAliases/");
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJs/TestPackage")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TestPackage extends AbstractJsDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTestPackage() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJs/TestPackage"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJs/TypeAliases")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeAliases extends AbstractJsDecompiledTextFromJsMetadataTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeAliases() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJs/TypeAliases"), Pattern.compile("^([^\\.]+)$"), TargetBackend.JS, true);
+        }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java

@@ -21,31 +21,83 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JvmDecompiledTextTestGenerated extends AbstractJvmDecompiledTextTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInDecompiledTextJvm() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("Modifiers")
     public void testModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/Modifiers/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJvm/Modifiers/");
     }
 
     @TestMetadata("MultifileClass")
     public void testMultifileClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/MultifileClass/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJvm/MultifileClass/");
     }
 
     @TestMetadata("TestKt")
     public void testTestKt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/TestKt/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJvm/TestKt/");
     }
 
     @TestMetadata("TypeAliases")
     public void testTypeAliases() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/TypeAliases/");
-        doTest(fileName);
+        runTest("idea/testData/decompiler/decompiledTextJvm/TypeAliases/");
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJvm/Modifiers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Modifiers extends AbstractJvmDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInModifiers() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm/Modifiers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJvm/MultifileClass")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MultifileClass extends AbstractJvmDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInMultifileClass() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm/MultifileClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJvm/TestKt")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TestKt extends AbstractJvmDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTestKt() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm/TestKt"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+    }
+
+    @TestMetadata("idea/testData/decompiler/decompiledTextJvm/TypeAliases")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TypeAliases extends AbstractJvmDecompiledTextTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInTypeAliases() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm/TypeAliases"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/editor/MultiLineStringIndentTestGenerated.java

@@ -21,6 +21,10 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiLineStringIndentTestGenerated extends AbstractMultiLineStringIndentTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInMultilineString() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/enterHandler/multilineString"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
@@ -29,230 +33,197 @@ public class MultiLineStringIndentTestGenerated extends AbstractMultiLineStringI
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Spaces extends AbstractMultiLineStringIndentTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSpaces() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/enterHandler/multilineString/spaces"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("dontAddMarginCharWhenMultilineWithoutMargins.kt")
         public void testDontAddMarginCharWhenMultilineWithoutMargins() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginCharWhenMultilineWithoutMargins.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginCharWhenMultilineWithoutMargins.kt");
         }
 
         @TestMetadata("dontAddMarginWhenItIsUnused.kt")
         public void testDontAddMarginWhenItIsUnused() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginWhenItIsUnused.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginWhenItIsUnused.kt");
         }
 
         @TestMetadata("dontAddMarginWhenItIsUnusedWithEmptyPrevious.kt")
         public void testDontAddMarginWhenItIsUnusedWithEmptyPrevious() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginWhenItIsUnusedWithEmptyPrevious.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontAddMarginWhenItIsUnusedWithEmptyPrevious.kt");
         }
 
         @TestMetadata("dontAddTrimCallWhenAlreadyMultiline.kt")
         public void testDontAddTrimCallWhenAlreadyMultiline() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontAddTrimCallWhenAlreadyMultiline.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontAddTrimCallWhenAlreadyMultiline.kt");
         }
 
         @TestMetadata("dontAddTrimCallWhenAlreadyMultilineFirstLine.kt")
         public void testDontAddTrimCallWhenAlreadyMultilineFirstLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontAddTrimCallWhenAlreadyMultilineFirstLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontAddTrimCallWhenAlreadyMultilineFirstLine.kt");
         }
 
         @TestMetadata("dontInsertTrimMargin1.kt")
         public void testDontInsertTrimMargin1() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin1.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin1.kt");
         }
 
         @TestMetadata("dontInsertTrimMargin2.kt")
         public void testDontInsertTrimMargin2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin2.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin2.kt");
         }
 
         @TestMetadata("dontInsertTrimMargin3.kt")
         public void testDontInsertTrimMargin3() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin3.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin3.kt");
         }
 
         @TestMetadata("dontInsertTrimMargin4.kt")
         public void testDontInsertTrimMargin4() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin4.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/dontInsertTrimMargin4.kt");
         }
 
         @TestMetadata("enterAfterOpenningBrace.kt")
         public void testEnterAfterOpenningBrace() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterAfterOpenningBrace.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterAfterOpenningBrace.kt");
         }
 
         @TestMetadata("enterBeforeLongEntryOneLine.kt")
         public void testEnterBeforeLongEntryOneLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeLongEntryOneLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeLongEntryOneLine.kt");
         }
 
         @TestMetadata("enterBeforeMarginChar.kt")
         public void testEnterBeforeMarginChar() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeMarginChar.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeMarginChar.kt");
         }
 
         @TestMetadata("enterBeforeShortEntryOneLine.kt")
         public void testEnterBeforeShortEntryOneLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeShortEntryOneLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterBeforeShortEntryOneLine.kt");
         }
 
         @TestMetadata("enterInInfixMargin.kt")
         public void testEnterInInfixMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInInfixMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInInfixMargin.kt");
         }
 
         @TestMetadata("enterInInjectedFragment.kt")
         public void testEnterInInjectedFragment() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInInjectedFragment.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInInjectedFragment.kt");
         }
 
         @TestMetadata("enterInLineWithMarginOnNotMargedLine.kt")
         public void testEnterInLineWithMarginOnNotMargedLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInLineWithMarginOnNotMargedLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInLineWithMarginOnNotMargedLine.kt");
         }
 
         @TestMetadata("enterInMethodCallMargin.kt")
         public void testEnterInMethodCallMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInMethodCallMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInMethodCallMargin.kt");
         }
 
         @TestMetadata("enterInOneLineAfterSpaces.kt")
         public void testEnterInOneLineAfterSpaces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInOneLineAfterSpaces.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInOneLineAfterSpaces.kt");
         }
 
         @TestMetadata("enterInTwoLinesNoMarginCall.kt")
         public void testEnterInTwoLinesNoMarginCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInTwoLinesNoMarginCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInTwoLinesNoMarginCall.kt");
         }
 
         @TestMetadata("enterInsideBraces.kt")
         public void testEnterInsideBraces() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces.kt");
         }
 
         @TestMetadata("enterInsideBraces1.kt")
         public void testEnterInsideBraces1() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces1.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces1.kt");
         }
 
         @TestMetadata("enterInsideBraces2.kt")
         public void testEnterInsideBraces2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces2.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideBraces2.kt");
         }
 
         @TestMetadata("enterInsideTextMargin.kt")
         public void testEnterInsideTextMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideTextMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterInsideTextMargin.kt");
         }
 
         @TestMetadata("enterMLSimpleMargin.kt")
         public void testEnterMLSimpleMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterMLSimpleMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterMLSimpleMargin.kt");
         }
 
         @TestMetadata("enterMLStartOnSameLineMargin.kt")
         public void testEnterMLStartOnSameLineMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterMLStartOnSameLineMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterMLStartOnSameLineMargin.kt");
         }
 
         @TestMetadata("enterOnFirstLineWithPresentTrimMargin.kt")
         public void testEnterOnFirstLineWithPresentTrimMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstLineWithPresentTrimMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstLineWithPresentTrimMargin.kt");
         }
 
         @TestMetadata("enterOnFirstLineWithPresentTrimMarginAndLine.kt")
         public void testEnterOnFirstLineWithPresentTrimMarginAndLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstLineWithPresentTrimMarginAndLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstLineWithPresentTrimMarginAndLine.kt");
         }
 
         @TestMetadata("enterOnFirstNonEmptyLineWithPresentTrimMargin.kt")
         public void testEnterOnFirstNonEmptyLineWithPresentTrimMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstNonEmptyLineWithPresentTrimMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterOnFirstNonEmptyLineWithPresentTrimMargin.kt");
         }
 
         @TestMetadata("enterOnNewLine.kt")
         public void testEnterOnNewLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterOnNewLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterOnNewLine.kt");
         }
 
         @TestMetadata("enterSimple.kt")
         public void testEnterSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterSimple.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterSimple.kt");
         }
 
         @TestMetadata("enterWithTextMargin.kt")
         public void testEnterWithTextMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterWithTextMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterWithTextMargin.kt");
         }
 
         @TestMetadata("enterWithTextOnNewLineMargin.kt")
         public void testEnterWithTextOnNewLineMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/enterWithTextOnNewLineMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/enterWithTextOnNewLineMargin.kt");
         }
 
         @TestMetadata("insertCustomMargin.kt")
         public void testInsertCustomMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/insertCustomMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/insertCustomMargin.kt");
         }
 
         @TestMetadata("insertCustomMarginInLineStart.kt")
         public void testInsertCustomMarginInLineStart() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/insertCustomMarginInLineStart.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/insertCustomMarginInLineStart.kt");
         }
 
         @TestMetadata("insertDefaultMargin.kt")
         public void testInsertDefaultMargin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/insertDefaultMargin.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/insertDefaultMargin.kt");
         }
 
         @TestMetadata("noTrimIndentInAnnotations.kt")
         public void testNoTrimIndentInAnnotations() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/noTrimIndentInAnnotations.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/noTrimIndentInAnnotations.kt");
         }
 
         @TestMetadata("restoreIndentFromEmptyLine.kt")
         public void testRestoreIndentFromEmptyLine() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/spaces/restoreIndentFromEmptyLine.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/enterHandler/multilineString/spaces/restoreIndentFromEmptyLine.kt");
         }
     }
 
@@ -260,6 +231,10 @@ public class MultiLineStringIndentTestGenerated extends AbstractMultiLineStringI
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithTabs extends AbstractMultiLineStringIndentTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInWithTabs() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/enterHandler/multilineString/withTabs"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
@@ -268,74 +243,67 @@ public class MultiLineStringIndentTestGenerated extends AbstractMultiLineStringI
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Tabs2 extends AbstractMultiLineStringIndentTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInTabs2() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
             @TestMetadata("dontInsertTrimMarginCall.kt")
             public void testDontInsertTrimMarginCall() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/dontInsertTrimMarginCall.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/dontInsertTrimMarginCall.kt");
             }
 
             @TestMetadata("enterInMethodCallMargin.kt")
             public void testEnterInMethodCallMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInMethodCallMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInMethodCallMargin.kt");
             }
 
             @TestMetadata("enterInTwoLinesNoMarginCall.kt")
             public void testEnterInTwoLinesNoMarginCall() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInTwoLinesNoMarginCall.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInTwoLinesNoMarginCall.kt");
             }
 
             @TestMetadata("enterInsideBraces.kt")
             public void testEnterInsideBraces() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInsideBraces.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInsideBraces.kt");
             }
 
             @TestMetadata("enterInsideText.kt")
             public void testEnterInsideText() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInsideText.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterInsideText.kt");
             }
 
             @TestMetadata("enterMLSimpleMargin.kt")
             public void testEnterMLSimpleMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterMLSimpleMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterMLSimpleMargin.kt");
             }
 
             @TestMetadata("enterMLStartOnSameLineMargin.kt")
             public void testEnterMLStartOnSameLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterMLStartOnSameLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterMLStartOnSameLineMargin.kt");
             }
 
             @TestMetadata("enterOnNewLineMargin.kt")
             public void testEnterOnNewLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterOnNewLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterOnNewLineMargin.kt");
             }
 
             @TestMetadata("enterSimpleMargin.kt")
             public void testEnterSimpleMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterSimpleMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterSimpleMargin.kt");
             }
 
             @TestMetadata("enterWithTextMargin.kt")
             public void testEnterWithTextMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterWithTextMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterWithTextMargin.kt");
             }
 
             @TestMetadata("enterWithTextOnNewLineMargin.kt")
             public void testEnterWithTextOnNewLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterWithTextOnNewLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs2/enterWithTextOnNewLineMargin.kt");
             }
         }
 
@@ -343,74 +311,67 @@ public class MultiLineStringIndentTestGenerated extends AbstractMultiLineStringI
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Tabs4 extends AbstractMultiLineStringIndentTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+            }
+
             public void testAllFilesPresentInTabs4() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
             @TestMetadata("dontInsertTrimMarginCall.kt")
             public void testDontInsertTrimMarginCall() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/dontInsertTrimMarginCall.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/dontInsertTrimMarginCall.kt");
             }
 
             @TestMetadata("enterInMethodCallMargin.kt")
             public void testEnterInMethodCallMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInMethodCallMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInMethodCallMargin.kt");
             }
 
             @TestMetadata("enterInsideBraces.kt")
             public void testEnterInsideBraces() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInsideBraces.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInsideBraces.kt");
             }
 
             @TestMetadata("enterInsideText.kt")
             public void testEnterInsideText() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInsideText.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterInsideText.kt");
             }
 
             @TestMetadata("enterMLSimpleMargin.kt")
             public void testEnterMLSimpleMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterMLSimpleMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterMLSimpleMargin.kt");
             }
 
             @TestMetadata("enterMLStartOnSameLineMargin.kt")
             public void testEnterMLStartOnSameLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterMLStartOnSameLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterMLStartOnSameLineMargin.kt");
             }
 
             @TestMetadata("enterOnNewLineMargin.kt")
             public void testEnterOnNewLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterOnNewLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterOnNewLineMargin.kt");
             }
 
             @TestMetadata("enterSimpleMargin.kt")
             public void testEnterSimpleMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterSimpleMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterSimpleMargin.kt");
             }
 
             @TestMetadata("enterWithTabsAfterMarginChar.kt")
             public void testEnterWithTabsAfterMarginChar() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTabsAfterMarginChar.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTabsAfterMarginChar.kt");
             }
 
             @TestMetadata("enterWithTextMargin.kt")
             public void testEnterWithTextMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTextMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTextMargin.kt");
             }
 
             @TestMetadata("enterWithTextOnNewLineMargin.kt")
             public void testEnterWithTextOnNewLineMargin() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTextOnNewLineMargin.kt");
-                doTest(fileName);
+                runTest("idea/testData/editor/enterHandler/multilineString/withTabs/tabs4/enterWithTextOnNewLineMargin.kt");
             }
         }
     }

idea/tests/org/jetbrains/kotlin/idea/editor/backspaceHandler/BackspaceHandlerTestGenerated.java

@@ -21,34 +21,39 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class BackspaceHandlerTestGenerated extends AbstractBackspaceHandlerTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInBackspaceHandler() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/backspaceHandler"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("typeArguments.kt")
     public void testTypeArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/backspaceHandler/typeArguments.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/backspaceHandler/typeArguments.kt");
     }
 
     @TestMetadata("idea/testData/editor/backspaceHandler/stringTemplate")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class StringTemplate extends AbstractBackspaceHandlerTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInStringTemplate() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/backspaceHandler/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("escapedStringTemplate.kt")
         public void testEscapedStringTemplate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/backspaceHandler/stringTemplate/escapedStringTemplate.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/backspaceHandler/stringTemplate/escapedStringTemplate.kt");
         }
 
         @TestMetadata("stringTemplateBrackets.kt")
         public void testStringTemplateBrackets() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/backspaceHandler/stringTemplate/stringTemplateBrackets.kt");
-            doTest(fileName);
+            runTest("idea/testData/editor/backspaceHandler/stringTemplate/stringTemplateBrackets.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java

@@ -21,283 +21,241 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class QuickDocProviderTestGenerated extends AbstractQuickDocProviderTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInQuickDoc() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("AnonymousObjectLocalVariable.kt")
     public void testAnonymousObjectLocalVariable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt");
     }
 
     @TestMetadata("AtConstantWithUnderscore.kt")
     public void testAtConstantWithUnderscore() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt");
     }
 
     @TestMetadata("AtFunctionParameter.kt")
     public void testAtFunctionParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtFunctionParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtFunctionParameter.kt");
     }
 
     @TestMetadata("AtImplicitLambdaParametEnd.kt")
     public void testAtImplicitLambdaParametEnd() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt");
     }
 
     @TestMetadata("AtImplicitLambdaParameter.kt")
     public void testAtImplicitLambdaParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt");
     }
 
     @TestMetadata("AtLocalFunction.kt")
     public void testAtLocalFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtLocalFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtLocalFunction.kt");
     }
 
     @TestMetadata("AtTypeParameter.kt")
     public void testAtTypeParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtTypeParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtTypeParameter.kt");
     }
 
     @TestMetadata("AtVariableDeclaration.kt")
     public void testAtVariableDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtVariableDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/AtVariableDeclaration.kt");
     }
 
     @TestMetadata("ConstructorVarParameter.kt")
     public void testConstructorVarParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/ConstructorVarParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/ConstructorVarParameter.kt");
     }
 
     @TestMetadata("DeprecationWithReplaceInfo.kt")
     public void testDeprecationWithReplaceInfo() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt");
     }
 
     @TestMetadata("EscapeHtmlInsideCodeBlocks.kt")
     public void testEscapeHtmlInsideCodeBlocks() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt");
     }
 
     @TestMetadata("ExtensionReceiver.kt")
     public void testExtensionReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/ExtensionReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/ExtensionReceiver.kt");
     }
 
     @TestMetadata("ExtensionReceiverEnd.kt")
     public void testExtensionReceiverEnd() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt");
     }
 
     @TestMetadata("IndentedCodeBlock.kt")
     public void testIndentedCodeBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/IndentedCodeBlock.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/IndentedCodeBlock.kt");
     }
 
     @TestMetadata("JavaClassUsedInKotlin.kt")
     public void testJavaClassUsedInKotlin() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt");
     }
 
     @TestMetadata("JavaDocFromOverridenClass.kt")
     public void testJavaDocFromOverridenClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt");
     }
 
     @TestMetadata("JavaDocFromOverridenInterface.kt")
     public void testJavaDocFromOverridenInterface() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt");
     }
 
     @TestMetadata("JavaMethodUsedInKotlin.kt")
     public void testJavaMethodUsedInKotlin() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt");
     }
 
     @TestMetadata("KotlinClassUsedFromJava.java")
     public void testKotlinClassUsedFromJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java");
     }
 
     @TestMetadata("KotlinPackageClassUsedFromJava.java")
     public void testKotlinPackageClassUsedFromJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java");
     }
 
     @TestMetadata("MethodFromStdLib.kt")
     public void testMethodFromStdLib() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/MethodFromStdLib.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/MethodFromStdLib.kt");
     }
 
     @TestMetadata("OnClassDeclarationWithNoPackage.kt")
     public void testOnClassDeclarationWithNoPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt");
     }
 
     @TestMetadata("OnEnumClassReference.kt")
     public void testOnEnumClassReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumClassReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumClassReference.kt");
     }
 
     @TestMetadata("OnEnumDeclaration.kt")
     public void testOnEnumDeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumDeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumDeclaration.kt");
     }
 
     @TestMetadata("OnEnumEntry.kt")
     public void testOnEnumEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumEntry.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumEntry.kt");
     }
 
     @TestMetadata("OnEnumEntryUsage.kt")
     public void testOnEnumEntryUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumEntryUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumEntryUsage.kt");
     }
 
     @TestMetadata("OnEnumUsage.kt")
     public void testOnEnumUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumUsage.kt");
     }
 
     @TestMetadata("OnEnumValueOfFunction.kt")
     public void testOnEnumValueOfFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt");
     }
 
     @TestMetadata("OnEnumValuesFunction.kt")
     public void testOnEnumValuesFunction() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnEnumValuesFunction.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnEnumValuesFunction.kt");
     }
 
     @TestMetadata("OnFunctionDeclarationWithPackage.kt")
     public void testOnFunctionDeclarationWithPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt");
     }
 
     @TestMetadata("OnInheritedMethodUsage.kt")
     public void testOnInheritedMethodUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt");
     }
 
     @TestMetadata("OnInheritedPropertyUsage.kt")
     public void testOnInheritedPropertyUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt");
     }
 
     @TestMetadata("OnMethodUsage.kt")
     public void testOnMethodUsage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsage.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsage.kt");
     }
 
     @TestMetadata("OnMethodUsageMultiline.kt")
     public void testOnMethodUsageMultiline() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt");
     }
 
     @TestMetadata("OnMethodUsageWithBracketsInParam.kt")
     public void testOnMethodUsageWithBracketsInParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt");
     }
 
     @TestMetadata("OnMethodUsageWithCodeBlock.kt")
     public void testOnMethodUsageWithCodeBlock() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt");
     }
 
     @TestMetadata("OnMethodUsageWithMarkdown.kt")
     public void testOnMethodUsageWithMarkdown() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt");
     }
 
     @TestMetadata("OnMethodUsageWithMultilineParam.kt")
     public void testOnMethodUsageWithMultilineParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt");
     }
 
     @TestMetadata("OnMethodUsageWithReceiver.kt")
     public void testOnMethodUsageWithReceiver() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt");
     }
 
     @TestMetadata("OnMethodUsageWithReturnAndLink.kt")
     public void testOnMethodUsageWithReturnAndLink() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt");
     }
 
     @TestMetadata("OnMethodUsageWithReturnAndThrows.kt")
     public void testOnMethodUsageWithReturnAndThrows() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt");
     }
 
     @TestMetadata("OnMethodUsageWithSee.kt")
     public void testOnMethodUsageWithSee() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt");
     }
 
     @TestMetadata("OnMethodUsageWithTypeParameter.kt")
     public void testOnMethodUsageWithTypeParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt");
     }
 
     @TestMetadata("Samples.kt")
     public void testSamples() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/Samples.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/Samples.kt");
     }
 
     @TestMetadata("TopLevelMethodFromJava.java")
     public void testTopLevelMethodFromJava() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java");
     }
 
     @TestMetadata("TypeNamesFromStdLibNavigation.kt")
     public void testTypeNamesFromStdLibNavigation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt");
-        doTest(fileName);
+        runTest("idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTestGenerated.java

@@ -21,115 +21,101 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinExceptionFilterTestGenerated extends AbstractKotlinExceptionFilterTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInExceptionFilter() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/exceptionFilter"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("breakpointReachedAt")
     public void testBreakpointReachedAt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/breakpointReachedAt/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/breakpointReachedAt/");
     }
 
     @TestMetadata("inlineFunCallInLibrary")
     public void testInlineFunCallInLibrary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunCallInLibrary/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunCallInLibrary/");
     }
 
     @TestMetadata("inlineFunFromLibrary")
     public void testInlineFunFromLibrary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunFromLibrary/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunFromLibrary/");
     }
 
     @TestMetadata("inlineFunInnerClassFromLibrary")
     public void testInlineFunInnerClassFromLibrary() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunInnerClassFromLibrary/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunInnerClassFromLibrary/");
     }
 
     @TestMetadata("inlineFunctionAnotherFile")
     public void testInlineFunctionAnotherFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionAnotherFile/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunctionAnotherFile/");
     }
 
     @TestMetadata("inlineFunctionAnotherFileWithSmapApplied")
     public void testInlineFunctionAnotherFileWithSmapApplied() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionAnotherFileWithSmapApplied/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunctionAnotherFileWithSmapApplied/");
     }
 
     @TestMetadata("inlineFunctionInnerClass")
     public void testInlineFunctionInnerClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionInnerClass/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunctionInnerClass/");
     }
 
     @TestMetadata("inlineFunctionObjectLiteral")
     public void testInlineFunctionObjectLiteral() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionObjectLiteral/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunctionObjectLiteral/");
     }
 
     @TestMetadata("inlineFunctionSameFile")
     public void testInlineFunctionSameFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/inlineFunctionSameFile/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/inlineFunctionSameFile/");
     }
 
     @TestMetadata("kotlinClass")
     public void testKotlinClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kotlinClass/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/kotlinClass/");
     }
 
     @TestMetadata("kt2489")
     public void testKt2489() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kt2489/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/kt2489/");
     }
 
     @TestMetadata("kt2489_2")
     public void testKt2489_2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/kt2489_2/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/kt2489_2/");
     }
 
     @TestMetadata("librarySources1")
     public void testLibrarySources1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/librarySources1/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/librarySources1/");
     }
 
     @TestMetadata("librarySources2")
     public void testLibrarySources2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/librarySources2/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/librarySources2/");
     }
 
     @TestMetadata("librarySources3")
     public void testLibrarySources3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/librarySources3/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/librarySources3/");
     }
 
     @TestMetadata("librarySources4")
     public void testLibrarySources4() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/librarySources4/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/librarySources4/");
     }
 
     @TestMetadata("multiSamePackage")
     public void testMultiSamePackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/multiSamePackage/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/multiSamePackage/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/exceptionFilter/simple/");
-        doTest(fileName);
+        runTest("idea/testData/debugger/exceptionFilter/simple/");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java

@@ -23,56 +23,52 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NoCollapse extends AbstractKotlinFoldingTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInNoCollapse() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/class.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/class.kt");
         }
 
         @TestMetadata("function.kt")
         public void testFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/function.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/function.kt");
         }
 
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/imports.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/imports.kt");
         }
 
         @TestMetadata("kdocComments.kt")
         public void testKdocComments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/kdocComments.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/kdocComments.kt");
         }
 
         @TestMetadata("multilineComments.kt")
         public void testMultilineComments() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/multilineComments.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/multilineComments.kt");
         }
 
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/object.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/object.kt");
         }
 
         @TestMetadata("oneImport.kt")
         public void testOneImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/oneImport.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/oneImport.kt");
         }
 
         @TestMetadata("singleLineString.kt")
         public void testSingleLineString() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/singleLineString.kt");
-            doTest(fileName);
+            runTest("idea/testData/folding/noCollapse/singleLineString.kt");
         }
     }
 
@@ -80,56 +76,52 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CheckCollapse extends AbstractKotlinFoldingTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doSettingsFoldingTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCheckCollapse() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("customRegions.kt")
         public void testCustomRegions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/customRegions.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/customRegions.kt");
         }
 
         @TestMetadata("customRegionsNotFullBlock.kt")
         public void testCustomRegionsNotFullBlock() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/customRegionsNotFullBlock.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/customRegionsNotFullBlock.kt");
         }
 
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/functionLiteral.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/functionLiteral.kt");
         }
 
         @TestMetadata("headerKDoc.kt")
         public void testHeaderKDoc() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerKDoc.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/headerKDoc.kt");
         }
 
         @TestMetadata("headerMultilineComment.kt")
         public void testHeaderMultilineComment() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerMultilineComment.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/headerMultilineComment.kt");
         }
 
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/imports.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/imports.kt");
         }
 
         @TestMetadata("multilineStrings.kt")
         public void testMultilineStrings() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/multilineStrings.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/multilineStrings.kt");
         }
 
         @TestMetadata("primaryConstructor.kt")
         public void testPrimaryConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/primaryConstructor.kt");
-            doSettingsFoldingTest(fileName);
+            runTest("idea/testData/folding/checkCollapse/primaryConstructor.kt");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java

@@ -23,182 +23,157 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Type extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTypeClassHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInType() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("CaretAtAnnotation")
         public void testCaretAtAnnotation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtAnnotation/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtAnnotation/");
         }
 
         @TestMetadata("CaretAtConstructor")
         public void testCaretAtConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtConstructor/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtConstructor/");
         }
 
         @TestMetadata("CaretAtFabricMethod")
         public void testCaretAtFabricMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtFabricMethod/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtFabricMethod/");
         }
 
         @TestMetadata("CaretAtImport")
         public void testCaretAtImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtImport/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtImport/");
         }
 
         @TestMetadata("CaretAtJavaType")
         public void testCaretAtJavaType() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtJavaType/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtJavaType/");
         }
 
         @TestMetadata("CaretAtModifierList")
         public void testCaretAtModifierList() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtModifierList/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtModifierList/");
         }
 
         @TestMetadata("CaretAtReceiverExtFun")
         public void testCaretAtReceiverExtFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/");
         }
 
         @TestMetadata("CaretAtSuperCall")
         public void testCaretAtSuperCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSuperCall/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtSuperCall/");
         }
 
         @TestMetadata("CaretAtSuperTypeCallEntry")
         public void testCaretAtSuperTypeCallEntry() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSuperTypeCallEntry/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtSuperTypeCallEntry/");
         }
 
         @TestMetadata("CaretAtSupertypesList")
         public void testCaretAtSupertypesList() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSupertypesList/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtSupertypesList/");
         }
 
         @TestMetadata("CaretAtTypeReference")
         public void testCaretAtTypeReference() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtTypeReference/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretAtTypeReference/");
         }
 
         @TestMetadata("CaretInClassBody")
         public void testCaretInClassBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretInClassBody/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/CaretInClassBody/");
         }
 
         @TestMetadata("ClassFromClass")
         public void testClassFromClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromClass/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/ClassFromClass/");
         }
 
         @TestMetadata("ClassFromObject")
         public void testClassFromObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromObject/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/ClassFromObject/");
         }
 
         @TestMetadata("ClassInClassObject")
         public void testClassInClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInClassObject/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/ClassInClassObject/");
         }
 
         @TestMetadata("ClassInPackage")
         public void testClassInPackage() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInPackage/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/ClassInPackage/");
         }
 
         @TestMetadata("InnerClass")
         public void testInnerClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/InnerClass/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/InnerClass/");
         }
 
         @TestMetadata("JKJHierarchy")
         public void testJKJHierarchy() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JKJHierarchy/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JKJHierarchy/");
         }
 
         @TestMetadata("JavaFromKotlin")
         public void testJavaFromKotlin() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlin/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JavaFromKotlin/");
         }
 
         @TestMetadata("JavaFromKotlinByRef")
         public void testJavaFromKotlinByRef() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/");
         }
 
         @TestMetadata("JavaFromKotlinForKotlinClass")
         public void testJavaFromKotlinForKotlinClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/");
         }
 
         @TestMetadata("JavaStyleClassLiteralInvalidCode")
         public void testJavaStyleClassLiteralInvalidCode() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaStyleClassLiteralInvalidCode/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JavaStyleClassLiteralInvalidCode/");
         }
 
         @TestMetadata("JetInt")
         public void testJetInt() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JetInt/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/JetInt/");
         }
 
         @TestMetadata("KJKHierarchy")
         public void testKJKHierarchy() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KJKHierarchy/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/KJKHierarchy/");
         }
 
         @TestMetadata("KotlinFromJava")
         public void testKotlinFromJava() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJava/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/KotlinFromJava/");
         }
 
         @TestMetadata("KotlinFromJavaByRef")
         public void testKotlinFromJavaByRef() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/");
         }
 
         @TestMetadata("KotlinFromKotlinByRef")
         public void testKotlinFromKotlinByRef() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/");
         }
 
         @TestMetadata("Object")
         public void testObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/Object/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/Object/");
         }
 
         @TestMetadata("TwoChildren")
         public void testTwoChildren() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/TwoChildren/");
-            doTypeClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/type/TwoChildren/");
         }
     }
 
@@ -206,32 +181,32 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Super extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doSuperClassHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSuper() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("JetList")
         public void testJetList() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/JetList/");
-            doSuperClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/super/JetList/");
         }
 
         @TestMetadata("MultiTypeAlias")
         public void testMultiTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/MultiTypeAlias/");
-            doSuperClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/super/MultiTypeAlias/");
         }
 
         @TestMetadata("TwoTraits")
         public void testTwoTraits() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/TwoTraits/");
-            doSuperClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/super/TwoTraits/");
         }
 
         @TestMetadata("TypeAlias")
         public void testTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/TypeAlias/");
-            doSuperClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/super/TypeAlias/");
         }
     }
 
@@ -239,92 +214,82 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Sub extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doSubClassHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInSub() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("AllFromClass")
         public void testAllFromClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromClass/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/AllFromClass/");
         }
 
         @TestMetadata("AllFromTrait")
         public void testAllFromTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromTrait/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/AllFromTrait/");
         }
 
         @TestMetadata("ClassFromClass")
         public void testClassFromClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromClass/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ClassFromClass/");
         }
 
         @TestMetadata("ClassFromTrait")
         public void testClassFromTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromTrait/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ClassFromTrait/");
         }
 
         @TestMetadata("ConstructorCallCaretAfter")
         public void testConstructorCallCaretAfter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ConstructorCallCaretAfter/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ConstructorCallCaretAfter/");
         }
 
         @TestMetadata("ConstructorCallCaretBefore")
         public void testConstructorCallCaretBefore() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ConstructorCallCaretBefore/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ConstructorCallCaretBefore/");
         }
 
         @TestMetadata("MultiTypeAlias")
         public void testMultiTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/MultiTypeAlias/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/MultiTypeAlias/");
         }
 
         @TestMetadata("ObjectFromClass")
         public void testObjectFromClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromClass/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ObjectFromClass/");
         }
 
         @TestMetadata("ObjectFromTrait")
         public void testObjectFromTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromTrait/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/ObjectFromTrait/");
         }
 
         @TestMetadata("SecondaryConstructorCallCaretAfter")
         public void testSecondaryConstructorCallCaretAfter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/SecondaryConstructorCallCaretAfter/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/SecondaryConstructorCallCaretAfter/");
         }
 
         @TestMetadata("SecondaryConstructorCallCaretBefore")
         public void testSecondaryConstructorCallCaretBefore() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/SecondaryConstructorCallCaretBefore/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/SecondaryConstructorCallCaretBefore/");
         }
 
         @TestMetadata("TraitFromClass")
         public void testTraitFromClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromClass/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/TraitFromClass/");
         }
 
         @TestMetadata("TraitFromTrait")
         public void testTraitFromTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromTrait/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/TraitFromTrait/");
         }
 
         @TestMetadata("TypeAlias")
         public void testTypeAlias() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TypeAlias/");
-            doSubClassHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/class/sub/TypeAlias/");
         }
     }
 
@@ -332,134 +297,117 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Callers extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doCallerHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCallers() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("callInsideAnonymousFun")
         public void testCallInsideAnonymousFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/callInsideAnonymousFun/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/callInsideAnonymousFun/");
         }
 
         @TestMetadata("callInsideLambda")
         public void testCallInsideLambda() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/callInsideLambda/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/callInsideLambda/");
         }
 
         @TestMetadata("kotlinClass")
         public void testKotlinClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinClass/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinClass/");
         }
 
         @TestMetadata("kotlinFunction")
         public void testKotlinFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunction/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinFunction/");
         }
 
         @TestMetadata("kotlinFunctionNonCallUsages")
         public void testKotlinFunctionNonCallUsages() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunctionNonCallUsages/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinFunctionNonCallUsages/");
         }
 
         @TestMetadata("kotlinInterface")
         public void testKotlinInterface() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinInterface/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinInterface/");
         }
 
         @TestMetadata("kotlinLocalClass")
         public void testKotlinLocalClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalClass/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinLocalClass/");
         }
 
         @TestMetadata("kotlinLocalFunction")
         public void testKotlinLocalFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/");
         }
 
         @TestMetadata("kotlinLocalFunctionWithNonLocalCallers")
         public void testKotlinLocalFunctionWithNonLocalCallers() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunctionWithNonLocalCallers/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinLocalFunctionWithNonLocalCallers/");
         }
 
         @TestMetadata("kotlinNestedClass")
         public void testKotlinNestedClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedClass/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinNestedClass/");
         }
 
         @TestMetadata("kotlinNestedInnerClass")
         public void testKotlinNestedInnerClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/");
         }
 
         @TestMetadata("kotlinPackageFunction")
         public void testKotlinPackageFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/");
         }
 
         @TestMetadata("kotlinPackageProperty")
         public void testKotlinPackageProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/");
         }
 
         @TestMetadata("kotlinPrimaryConstructorImplicitCalls")
         public void testKotlinPrimaryConstructorImplicitCalls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrimaryConstructorImplicitCalls/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPrimaryConstructorImplicitCalls/");
         }
 
         @TestMetadata("kotlinPrivateClass")
         public void testKotlinPrivateClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/");
         }
 
         @TestMetadata("kotlinPrivateFunction")
         public void testKotlinPrivateFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/");
         }
 
         @TestMetadata("kotlinPrivateProperty")
         public void testKotlinPrivateProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/");
         }
 
         @TestMetadata("kotlinProperty")
         public void testKotlinProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinProperty/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinProperty/");
         }
 
         @TestMetadata("kotlinSecondaryConstructor")
         public void testKotlinSecondaryConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructor/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructor/");
         }
 
         @TestMetadata("kotlinSecondaryConstructorImplicitCalls")
         public void testKotlinSecondaryConstructorImplicitCalls() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructorImplicitCalls/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructorImplicitCalls/");
         }
 
         @TestMetadata("kotlinUnresolvedFunction")
         public void testKotlinUnresolvedFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinUnresolvedFunction/");
-            doCallerHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callers/kotlinUnresolvedFunction/");
         }
     }
 
@@ -467,14 +415,17 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CallersJava extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doCallerJavaHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCallersJava() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callersJava"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("javaMethod")
         public void testJavaMethod() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callersJava/javaMethod/");
-            doCallerJavaHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callersJava/javaMethod/");
         }
     }
 
@@ -482,86 +433,77 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Callees extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doCalleeHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInCallees() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("kotlinAnonymousObject")
         public void testKotlinAnonymousObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/");
         }
 
         @TestMetadata("kotlinClass")
         public void testKotlinClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClass/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinClass/");
         }
 
         @TestMetadata("kotlinClassObject")
         public void testKotlinClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClassObject/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinClassObject/");
         }
 
         @TestMetadata("kotlinEnumClass")
         public void testKotlinEnumClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinEnumClass/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinEnumClass/");
         }
 
         @TestMetadata("kotlinFunction")
         public void testKotlinFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinFunction/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinFunction/");
         }
 
         @TestMetadata("kotlinInterface")
         public void testKotlinInterface() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinInterface/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinInterface/");
         }
 
         @TestMetadata("kotlinLocalClass")
         public void testKotlinLocalClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalClass/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinLocalClass/");
         }
 
         @TestMetadata("kotlinLocalFunction")
         public void testKotlinLocalFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/");
         }
 
         @TestMetadata("kotlinNestedClass")
         public void testKotlinNestedClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinNestedClass/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinNestedClass/");
         }
 
         @TestMetadata("kotlinObject")
         public void testKotlinObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinObject/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinObject/");
         }
 
         @TestMetadata("kotlinPackageFunction")
         public void testKotlinPackageFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/");
         }
 
         @TestMetadata("kotlinPackageProperty")
         public void testKotlinPackageProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/");
         }
 
         @TestMetadata("kotlinProperty")
         public void testKotlinProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinProperty/");
-            doCalleeHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/calls/callees/kotlinProperty/");
         }
     }
 
@@ -569,50 +511,47 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Overrides extends AbstractHierarchyTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doOverrideHierarchyTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInOverrides() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("kotlinBuiltInMemberFunction")
         public void testKotlinBuiltInMemberFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinBuiltInMemberFunction/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinBuiltInMemberFunction/");
         }
 
         @TestMetadata("kotlinFunctionInClass")
         public void testKotlinFunctionInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInClass/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinFunctionInClass/");
         }
 
         @TestMetadata("kotlinFunctionInTrait")
         public void testKotlinFunctionInTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/");
         }
 
         @TestMetadata("kotlinPropertyInClass")
         public void testKotlinPropertyInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInClass/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinPropertyInClass/");
         }
 
         @TestMetadata("kotlinPropertyInTrait")
         public void testKotlinPropertyInTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/");
         }
 
         @TestMetadata("kotlinTopLevelFunction")
         public void testKotlinTopLevelFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinTopLevelFunction/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinTopLevelFunction/");
         }
 
         @TestMetadata("kotlinVarParameter")
         public void testKotlinVarParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinVarParameter/");
-            doOverrideHierarchyTest(fileName);
+            runTest("idea/testData/hierarchy/overrides/kotlinVarParameter/");
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyWithLibTestGenerated.java

@@ -21,19 +21,21 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class HierarchyWithLibTestGenerated extends AbstractHierarchyWithLibTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInWithLib() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/withLib"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
     }
 
     @TestMetadata("annotation")
     public void testAnnotation() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/withLib/annotation/");
-        doTest(fileName);
+        runTest("idea/testData/hierarchy/withLib/annotation/");
     }
 
     @TestMetadata("enum")
     public void testEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/withLib/enum/");
-        doTest(fileName);
+        runTest("idea/testData/hierarchy/withLib/enum/");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java

@@ -21,19 +21,21 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class DiagnosticMessageJsTestGenerated extends AbstractDiagnosticMessageJsTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JS, testDataFilePath);
+    }
+
     public void testAllFilesPresentInJs() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage/js"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, false);
     }
 
     @TestMetadata("jsCodeErrorHtml.kt")
     public void testJsCodeErrorHtml() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorHtml.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/js/jsCodeErrorHtml.kt");
     }
 
     @TestMetadata("jsCodeErrorText.kt")
     public void testJsCodeErrorText() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorText.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/js/jsCodeErrorText.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java

@@ -21,10 +21,13 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     @TestMetadata("abstractBaseClassMemberNotImplemented.kt")
     public void testAbstractBaseClassMemberNotImplemented() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented.kt");
     }
 
     public void testAllFilesPresentInDiagnosticMessage() throws Exception {
@@ -33,295 +36,246 @@ public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTes
 
     @TestMetadata("annotationsForResolve.kt")
     public void testAnnotationsForResolve() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/annotationsForResolve.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/annotationsForResolve.kt");
     }
 
     @TestMetadata("assignedButNeverAccessedVariable.kt")
     public void testAssignedButNeverAccessedVariable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt");
     }
 
     @TestMetadata("cannotInferVisibility.kt")
     public void testCannotInferVisibility() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotInferVisibility.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/cannotInferVisibility.kt");
     }
 
     @TestMetadata("cannotOverrideInvisibleMember.kt")
     public void testCannotOverrideInvisibleMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt");
     }
 
     @TestMetadata("complexTypeMismatchWithTypeParameters.kt")
     public void testComplexTypeMismatchWithTypeParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/complexTypeMismatchWithTypeParameters.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/complexTypeMismatchWithTypeParameters.kt");
     }
 
     @TestMetadata("complexTypeMismatchWithTypeParametersAndTypeAlias.kt")
     public void testComplexTypeMismatchWithTypeParametersAndTypeAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/complexTypeMismatchWithTypeParametersAndTypeAlias.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/complexTypeMismatchWithTypeParametersAndTypeAlias.kt");
     }
 
     @TestMetadata("conflictingOverloadsClass.kt")
     public void testConflictingOverloadsClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt");
     }
 
     @TestMetadata("conflictingOverloadsDefaultPackage.kt")
     public void testConflictingOverloadsDefaultPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt");
     }
 
     @TestMetadata("conflictingSubstitutions.kt")
     public void testConflictingSubstitutions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingSubstitutions.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/conflictingSubstitutions.kt");
     }
 
     @TestMetadata("constructorsRedeclaration.kt")
     public void testConstructorsRedeclaration() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclaration.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/constructorsRedeclaration.kt");
     }
 
     @TestMetadata("constructorsRedeclarationTopLevel.kt")
     public void testConstructorsRedeclarationTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel.kt");
     }
 
     @TestMetadata("differentNamesForSameParameter.kt")
     public void testDifferentNamesForSameParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt");
     }
 
     @TestMetadata("expectedNothingDueToProjections.kt")
     public void testExpectedNothingDueToProjections() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt");
     }
 
     @TestMetadata("extensionInClassReference.kt")
     public void testExtensionInClassReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/extensionInClassReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/extensionInClassReference.kt");
     }
 
     @TestMetadata("functionPlaceholder.kt")
     public void testFunctionPlaceholder() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/functionPlaceholder.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/functionPlaceholder.kt");
     }
 
     @TestMetadata("illegalSuspendCall.kt")
     public void testIllegalSuspendCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/illegalSuspendCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/illegalSuspendCall.kt");
     }
 
     @TestMetadata("invisibleMember.kt")
     public void testInvisibleMember() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/invisibleMember.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/invisibleMember.kt");
     }
 
     @TestMetadata("multipleDefaultsFromSupertypes.kt")
     public void testMultipleDefaultsFromSupertypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt");
     }
 
     @TestMetadata("nameInConstraintIsNotATypeParameter.kt")
     public void testNameInConstraintIsNotATypeParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt");
     }
 
     @TestMetadata("nestedClassAcessedViaInstanceReference.kt")
     public void testNestedClassAcessedViaInstanceReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt");
     }
 
     @TestMetadata("nestedClassShouldBeQualified.kt")
     public void testNestedClassShouldBeQualified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt");
     }
 
     @TestMetadata("noneApplicable.kt")
     public void testNoneApplicable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicable.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicable.kt");
     }
 
     @TestMetadata("noneApplicableCallableReference.kt")
     public void testNoneApplicableCallableReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableCallableReference.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicableCallableReference.kt");
     }
 
     @TestMetadata("noneApplicableConstructor.kt")
     public void testNoneApplicableConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableConstructor.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicableConstructor.kt");
     }
 
     @TestMetadata("noneApplicableGeneric.kt")
     public void testNoneApplicableGeneric() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableGeneric.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicableGeneric.kt");
     }
 
     @TestMetadata("noneApplicableHtml.kt")
     public void testNoneApplicableHtml() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableHtml.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicableHtml.kt");
     }
 
     @TestMetadata("noneApplicableTxt.kt")
     public void testNoneApplicableTxt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableTxt.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/noneApplicableTxt.kt");
     }
 
     @TestMetadata("numberValueTypes.kt")
     public void testNumberValueTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/numberValueTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/numberValueTypes.kt");
     }
 
     @TestMetadata("overloadResolutionAmbiguityHtml.kt")
     public void testOverloadResolutionAmbiguityHtml() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/overloadResolutionAmbiguityHtml.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/overloadResolutionAmbiguityHtml.kt");
     }
 
     @TestMetadata("overloadResolutionAmbiguityTxt.kt")
     public void testOverloadResolutionAmbiguityTxt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/overloadResolutionAmbiguityTxt.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/overloadResolutionAmbiguityTxt.kt");
     }
 
     @TestMetadata("renderCollectionOfTypes.kt")
     public void testRenderCollectionOfTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt");
     }
 
     @TestMetadata("returnTypeMismatchOnOverride.kt")
     public void testReturnTypeMismatchOnOverride() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt");
     }
 
     @TestMetadata("typeInferenceCannotCaptureTypes.kt")
     public void testTypeInferenceCannotCaptureTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt");
     }
 
     @TestMetadata("typeInferenceExpectedTypeMismatch.kt")
     public void testTypeInferenceExpectedTypeMismatch() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt");
     }
 
     @TestMetadata("typeMismatchDueToProjections.kt")
     public void testTypeMismatchDueToProjections() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt");
     }
 
     @TestMetadata("typeMismatchDueToProjectionsIn.kt")
     public void testTypeMismatchDueToProjectionsIn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt");
     }
 
     @TestMetadata("typeMismatchDueToProjectionsTxt.kt")
     public void testTypeMismatchDueToProjectionsTxt() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt");
     }
 
     @TestMetadata("typeMismatchWithFunctionalType.kt")
     public void testTypeMismatchWithFunctionalType() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithFunctionalType.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchWithFunctionalType.kt");
     }
 
     @TestMetadata("typeMismatchWithNothing.kt")
     public void testTypeMismatchWithNothing() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt");
     }
 
     @TestMetadata("typeMismatchWithTypeParameters.kt")
     public void testTypeMismatchWithTypeParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithTypeParameters.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeMismatchWithTypeParameters.kt");
     }
 
     @TestMetadata("typeParameterAsReified.kt")
     public void testTypeParameterAsReified() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeParameterAsReified.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeParameterAsReified.kt");
     }
 
     @TestMetadata("typeVarianceConflictInTypeAliasExpansion.kt")
     public void testTypeVarianceConflictInTypeAliasExpansion() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeVarianceConflictInTypeAliasExpansion.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/typeVarianceConflictInTypeAliasExpansion.kt");
     }
 
     @TestMetadata("unsupportedFeature.kt")
     public void testUnsupportedFeature() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unsupportedFeature.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/unsupportedFeature.kt");
     }
 
     @TestMetadata("unusedParameter.kt")
     public void testUnusedParameter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedParameter.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/unusedParameter.kt");
     }
 
     @TestMetadata("unusedValue.kt")
     public void testUnusedValue() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedValue.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/unusedValue.kt");
     }
 
     @TestMetadata("unusedVariable.kt")
     public void testUnusedVariable() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedVariable.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/unusedVariable.kt");
     }
 
     @TestMetadata("upperBoundViolated.kt")
     public void testUpperBoundViolated() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/upperBoundViolated.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/upperBoundViolated.kt");
     }
 
     @TestMetadata("upperBoundViolatedInTypeAliasConstructorCall.kt")
     public void testUpperBoundViolatedInTypeAliasConstructorCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt");
     }
 
     @TestMetadata("urlRender.kt")
     public void testUrlRender() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/urlRender.kt");
-        doTest(fileName);
+        runTest("idea/testData/diagnosticMessage/urlRender.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/highlighter/DslHighlighterTestGenerated.java

@@ -21,13 +21,16 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class DslHighlighterTestGenerated extends AbstractDslHighlighterTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInDslHighlighter() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dslHighlighter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("functionCalls.kt")
     public void testFunctionCalls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dslHighlighter/functionCalls.kt");
-        doTest(fileName);
+        runTest("idea/testData/dslHighlighter/functionCalls.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java

@@ -21,109 +21,96 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class HighlightExitPointsTestGenerated extends AbstractHighlightExitPointsTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInExitPoints() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/exitPoints"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("getter.kt")
     public void testGetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/getter.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/getter.kt");
     }
 
     @TestMetadata("inline1.kt")
     public void testInline1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inline1.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inline1.kt");
     }
 
     @TestMetadata("inline2.kt")
     public void testInline2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inline2.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inline2.kt");
     }
 
     @TestMetadata("inline3.kt")
     public void testInline3() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inline3.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inline3.kt");
     }
 
     @TestMetadata("inlineLocalReturn1.kt")
     public void testInlineLocalReturn1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn1.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inlineLocalReturn1.kt");
     }
 
     @TestMetadata("inlineLocalReturn2.kt")
     public void testInlineLocalReturn2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn2.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inlineLocalReturn2.kt");
     }
 
     @TestMetadata("inlineWithNoInlineParam.kt")
     public void testInlineWithNoInlineParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineWithNoInlineParam.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/inlineWithNoInlineParam.kt");
     }
 
     @TestMetadata("invalidReturn.kt")
     public void testInvalidReturn() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/invalidReturn.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/invalidReturn.kt");
     }
 
     @TestMetadata("invalidThrow.kt")
     public void testInvalidThrow() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/invalidThrow.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/invalidThrow.kt");
     }
 
     @TestMetadata("localFunction1.kt")
     public void testLocalFunction1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction1.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/localFunction1.kt");
     }
 
     @TestMetadata("localFunction2.kt")
     public void testLocalFunction2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction2.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/localFunction2.kt");
     }
 
     @TestMetadata("localFunctionThrow.kt")
     public void testLocalFunctionThrow() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunctionThrow.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/localFunctionThrow.kt");
     }
 
     @TestMetadata("notInline1.kt")
     public void testNotInline1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/notInline1.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/notInline1.kt");
     }
 
     @TestMetadata("notInline2.kt")
     public void testNotInline2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/notInline2.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/notInline2.kt");
     }
 
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/simple.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/simple.kt");
     }
 
     @TestMetadata("throw1.kt")
     public void testThrow1() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/throw1.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/throw1.kt");
     }
 
     @TestMetadata("throw2.kt")
     public void testThrow2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/throw2.kt");
-        doTest(fileName);
+        runTest("idea/testData/exitPoints/throw2.kt");
     }
 }

idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java

@@ -21,238 +21,209 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class HighlightingTestGenerated extends AbstractHighlightingTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+    }
+
     public void testAllFilesPresentInHighlighter() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("Annotations.kt")
     public void testAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Annotations.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Annotations.kt");
     }
 
     @TestMetadata("Dynamic.kt")
     public void testDynamic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Dynamic.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Dynamic.kt");
     }
 
     @TestMetadata("Enums.kt")
     public void testEnums() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Enums.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Enums.kt");
     }
 
     @TestMetadata("Field.kt")
     public void testField() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Field.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Field.kt");
     }
 
     @TestMetadata("Functions.kt")
     public void testFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Functions.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Functions.kt");
     }
 
     @TestMetadata("InvokeCall.kt")
     public void testInvokeCall() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/InvokeCall.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/InvokeCall.kt");
     }
 
     @TestMetadata("JavaTypes.kt")
     public void testJavaTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/JavaTypes.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/JavaTypes.kt");
     }
 
     @TestMetadata("KDoc.kt")
     public void testKDoc() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/KDoc.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/KDoc.kt");
     }
 
     @TestMetadata("KotlinInjection.kt")
     public void testKotlinInjection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/KotlinInjection.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/KotlinInjection.kt");
     }
 
     @TestMetadata("Labels.kt")
     public void testLabels() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Labels.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Labels.kt");
     }
 
     @TestMetadata("NamedArguments.kt")
     public void testNamedArguments() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/NamedArguments.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/NamedArguments.kt");
     }
 
     @TestMetadata("NonNullAssertion.kt")
     public void testNonNullAssertion() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/NonNullAssertion.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/NonNullAssertion.kt");
     }
 
     @TestMetadata("Object.kt")
     public void testObject() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Object.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Object.kt");
     }
 
     @TestMetadata("SmartCast.kt")
     public void testSmartCast() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/SmartCast.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/SmartCast.kt");
     }
 
     @TestMetadata("SyntheticExtensionProperty.kt")
     public void testSyntheticExtensionProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/SyntheticExtensionProperty.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/SyntheticExtensionProperty.kt");
     }
 
     @TestMetadata("Todo.kt")
     public void testTodo() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Todo.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Todo.kt");
     }
 
     @TestMetadata("TopLevelOpenSuspendFun.kt")
     public void testTopLevelOpenSuspendFun() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/TopLevelOpenSuspendFun.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/TopLevelOpenSuspendFun.kt");
     }
 
     @TestMetadata("TypeAlias.kt")
     public void testTypeAlias() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/TypeAlias.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/TypeAlias.kt");
     }
 
     @TestMetadata("TypesAndAnnotations.kt")
     public void testTypesAndAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/TypesAndAnnotations.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/TypesAndAnnotations.kt");
     }
 
     @TestMetadata("Variables.kt")
     public void testVariables() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Variables.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/Variables.kt");
     }
 
     @TestMetadata("VariablesAsFunctions.kt")
     public void testVariablesAsFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/VariablesAsFunctions.kt");
-        doTest(fileName);
+        runTest("idea/testData/highlighter/VariablesAsFunctions.kt");
     }
 
     @TestMetadata("idea/testData/highlighter/deprecated")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Deprecated extends AbstractHighlightingTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
         public void testAllFilesPresentInDeprecated() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Class.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Class.kt");
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ClassObject.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/ClassObject.kt");
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Constructor.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Constructor.kt");
         }
 
         @TestMetadata("ExtensionFunction.kt")
         public void testExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ExtensionFunction.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/ExtensionFunction.kt");
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Function.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Function.kt");
         }
 
         @TestMetadata("Get.kt")
         public void testGet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Get.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Get.kt");
         }
 
         @TestMetadata("Getter.kt")
         public void testGetter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Getter.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Getter.kt");
         }
 
         @TestMetadata("Inc.kt")
         public void testInc() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Inc.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Inc.kt");
         }
 
         @TestMetadata("Invalid.kt")
         public void testInvalid() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invalid.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Invalid.kt");
         }
 
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invoke.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Invoke.kt");
         }
 
         @TestMetadata("Operation.kt")
         public void testOperation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Operation.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Operation.kt");
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Property.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Property.kt");
         }
 
         @TestMetadata("RangeTo.kt")
         public void testRangeTo() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/RangeTo.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/RangeTo.kt");
         }
 
         @TestMetadata("Setter.kt")
         public void testSetter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Setter.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Setter.kt");
         }
 
         @TestMetadata("SuperCall.kt")
         public void testSuperCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/SuperCall.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/SuperCall.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Trait.kt");
-            doTest(fileName);
+            runTest("idea/testData/highlighter/deprecated/Trait.kt");
         }
     }
 }