Regenerate tests

idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/checker/js")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest {
     public void testAllFilesPresentInJs() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Recovery.class, JetPsiCheckerTestGenerated.Rendering.class, JetPsiCheckerTestGenerated.DuplicateJvmSignature.class, JetPsiCheckerTestGenerated.Infos.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Checker extends AbstractJetPsiCheckerTest {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
@@ -341,6 +345,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     
     @TestMetadata("idea/testData/checker/regression")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Regression extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRegression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -494,6 +499,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     
     @TestMetadata("idea/testData/checker/recovery")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Recovery extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRecovery() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -515,6 +521,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     
     @TestMetadata("idea/testData/checker/rendering")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Rendering extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRendering() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -531,6 +538,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/duplicateJvmSignature")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DuplicateJvmSignature.Fields.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.TraitImpl.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -538,6 +546,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Fields extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInFields() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -553,6 +562,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FunctionAndProperty extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInFunctionAndProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -610,6 +620,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class TraitImpl extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInTraitImpl() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -623,18 +634,11 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("DuplicateJvmSignature");
-            suite.addTestSuite(DuplicateJvmSignature.class);
-            suite.addTestSuite(Fields.class);
-            suite.addTestSuite(FunctionAndProperty.class);
-            suite.addTestSuite(TraitImpl.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/checker/infos")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Infos extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInInfos() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -678,14 +682,4 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetPsiCheckerTestGenerated");
-        suite.addTestSuite(Checker.class);
-        suite.addTestSuite(Regression.class);
-        suite.addTestSuite(Recovery.class);
-        suite.addTestSuite(Rendering.class);
-        suite.addTest(DuplicateJvmSignature.innerSuite());
-        suite.addTestSuite(Infos.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/completion/injava")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
@@ -102,9 +105,4 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         doTest(fileName);
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("CompiledKotlinInJavaCompletionTestGenerated");
-        suite.addTestSuite(CompiledKotlinInJavaCompletionTestGenerated.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/dataFlowValueRendering")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest {
     public void testAllFilesPresentInDataFlowValueRendering() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JSBasicCompletionTestGenerated.Common.class, JSBasicCompletionTestGenerated.Js.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Common extends AbstractJSBasicCompletionTest {
         @TestMetadata("AfterFloatOnNewLine.kt")
         public void testAfterFloatOnNewLine() throws Exception {
@@ -544,6 +548,7 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
         
         @TestMetadata("idea/testData/completion/basic/common/extensions")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Extensions extends AbstractJSBasicCompletionTest {
             public void testAllFilesPresentInExtensions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -607,6 +612,7 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
         
         @TestMetadata("idea/testData/completion/basic/common/namedParameters")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NamedParameters extends AbstractJSBasicCompletionTest {
             @TestMetadata("AfterBrace.kt")
             public void testAfterBrace() throws Exception {
@@ -692,17 +698,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Common");
-            suite.addTestSuite(Common.class);
-            suite.addTestSuite(Extensions.class);
-            suite.addTestSuite(NamedParameters.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/completion/basic/js")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Js extends AbstractJSBasicCompletionTest {
         public void testAllFilesPresentInJs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/js"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -728,10 +728,4 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JSBasicCompletionTestGenerated");
-        suite.addTest(Common.innerSuite());
-        suite.addTestSuite(Js.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JvmBasicCompletionTestGenerated.Common.class, JvmBasicCompletionTestGenerated.Java.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Common extends AbstractJvmBasicCompletionTest {
         @TestMetadata("AfterFloatOnNewLine.kt")
         public void testAfterFloatOnNewLine() throws Exception {
@@ -544,6 +548,7 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
         
         @TestMetadata("idea/testData/completion/basic/common/extensions")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Extensions extends AbstractJvmBasicCompletionTest {
             public void testAllFilesPresentInExtensions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -607,6 +612,7 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
         
         @TestMetadata("idea/testData/completion/basic/common/namedParameters")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NamedParameters extends AbstractJvmBasicCompletionTest {
             @TestMetadata("AfterBrace.kt")
             public void testAfterBrace() throws Exception {
@@ -692,17 +698,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Common");
-            suite.addTestSuite(Common.class);
-            suite.addTestSuite(Extensions.class);
-            suite.addTestSuite(NamedParameters.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/completion/basic/java")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Java extends AbstractJvmBasicCompletionTest {
         public void testAllFilesPresentInJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/java"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -764,10 +764,4 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JvmBasicCompletionTestGenerated");
-        suite.addTest(Common.innerSuite());
-        suite.addTestSuite(Java.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/smart")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
     @TestMetadata("AfterAs.kt")
     public void testAfterAs() throws Exception {

idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/custom")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
     public void testAllFilesPresentInCustom() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/custom"), Pattern.compile("^(.+)\\.kt$"), false);

idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/keywords")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
     @TestMetadata("AfterClassProperty.kt")
     public void testAfterClassProperty() throws Exception {

idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/completion/injava")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
@@ -102,9 +105,4 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         doTest(fileName);
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("KotlinSourceInJavaCompletionTestGenerated");
-        suite.addTestSuite(KotlinSourceInJavaCompletionTestGenerated.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/multifile")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest {
     public void testAllFilesPresentInMultifile() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false);

idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion.handlers;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/handlers/smart")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest {
     @TestMetadata("AfterAs.kt")
     public void testAfterAs() throws Exception {

idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.completion.weighers;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/weighers")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class CompletionWeigherTestGenerated extends AbstractCompletionWeigherTest {
     public void testAllFilesPresentInWeighers() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/weighers"), Pattern.compile("^([^\\.]+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.editor.quickDoc;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/editor/quickDoc")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProviderTest {
     public void testAllFilesPresentInQuickDoc() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), true);

idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.findUsages;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetFindUsagesTestGenerated.Kotlin.class, JetFindUsagesTestGenerated.Java.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
     @TestMetadata("idea/testData/findUsages/kotlin")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Kotlin.Conventions.class, Kotlin.FindClassUsages.class, Kotlin.FindFunctionUsages.class, Kotlin.FindObjectUsages.class, Kotlin.FindPackageUsages.class, Kotlin.FindParameterUsages.class, Kotlin.FindPropertyUsages.class, Kotlin.FindTypeParameterUsages.class, Kotlin.FindWithFilteringImports.class, Kotlin.FindWithStructuralGrouping.class, Kotlin.UnresolvedAnnotation.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Kotlin extends AbstractJetFindUsagesTest {
         public void testAllFilesPresentInKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -40,6 +44,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/conventions")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Conventions extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInConventions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/conventions"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -133,6 +138,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findClassUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindClassUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindClassUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -430,6 +436,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindFunctionUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindFunctionUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findFunctionUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -511,6 +518,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findObjectUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindObjectUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindObjectUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -556,6 +564,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findPackageUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindPackageUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindPackageUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPackageUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -571,6 +580,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findParameterUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindParameterUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindParameterUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -592,6 +602,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findPropertyUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindPropertyUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindPropertyUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -721,6 +732,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindTypeParameterUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindTypeParameterUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -742,6 +754,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindWithFilteringImports extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindWithFilteringImports() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -757,6 +770,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindWithStructuralGrouping extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindWithStructuralGrouping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithStructuralGrouping"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -784,6 +798,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class UnresolvedAnnotation extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInUnresolvedAnnotation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -797,27 +812,12 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Kotlin");
-            suite.addTestSuite(Kotlin.class);
-            suite.addTestSuite(Conventions.class);
-            suite.addTestSuite(FindClassUsages.class);
-            suite.addTestSuite(FindFunctionUsages.class);
-            suite.addTestSuite(FindObjectUsages.class);
-            suite.addTestSuite(FindPackageUsages.class);
-            suite.addTestSuite(FindParameterUsages.class);
-            suite.addTestSuite(FindPropertyUsages.class);
-            suite.addTestSuite(FindTypeParameterUsages.class);
-            suite.addTestSuite(FindWithFilteringImports.class);
-            suite.addTestSuite(FindWithStructuralGrouping.class);
-            suite.addTestSuite(UnresolvedAnnotation.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/findUsages/java")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Java.FindJavaClassUsages.class, Java.FindJavaFieldUsages.class, Java.FindJavaMethodUsages.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Java extends AbstractJetFindUsagesTest {
         public void testAllFilesPresentInJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -825,6 +825,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/java/findJavaClassUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindJavaClassUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaClassUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaClassUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -966,6 +967,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/java/findJavaFieldUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindJavaFieldUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaFieldUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaFieldUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -981,6 +983,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         
         @TestMetadata("idea/testData/findUsages/java/findJavaMethodUsages")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FindJavaMethodUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaMethodUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaMethodUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -1000,20 +1003,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Java");
-            suite.addTestSuite(Java.class);
-            suite.addTestSuite(FindJavaClassUsages.class);
-            suite.addTestSuite(FindJavaFieldUsages.class);
-            suite.addTestSuite(FindJavaMethodUsages.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetFindUsagesTestGenerated");
-        suite.addTest(Kotlin.innerSuite());
-        suite.addTest(Java.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.formatter;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetFormatterTestGenerated.Formatter.class, JetFormatterTestGenerated.FormatterInverted.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
     @TestMetadata("idea/testData/formatter")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Formatter.ModifierList.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Formatter extends AbstractJetFormatterTest {
         public void testAllFilesPresentInFormatter() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
@@ -442,6 +446,7 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         
         @TestMetadata("idea/testData/formatter/modifierList")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ModifierList extends AbstractJetFormatterTest {
             public void testAllFilesPresentInModifierList() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
@@ -545,17 +550,12 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Formatter");
-            suite.addTestSuite(Formatter.class);
-            suite.addTestSuite(ModifierList.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/formatter")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class FormatterInverted extends AbstractJetFormatterTest {
         public void testAllFilesPresentInFormatterInverted() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true);
@@ -747,17 +747,6 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
             doTestInverted(fileName);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("FormatterInverted");
-            suite.addTestSuite(FormatterInverted.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetFormatterTestGenerated");
-        suite.addTest(Formatter.innerSuite());
-        suite.addTest(FormatterInverted.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.formatter;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetTypingIndentationTestBaseGenerated.DirectSettings.class, JetTypingIndentationTestBaseGenerated.InvertedSettings.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingIndentationTestBase {
     @TestMetadata("idea/testData/indentationOnNewline")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DirectSettings.Script.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class DirectSettings extends AbstractJetTypingIndentationTestBase {
         @TestMetadata("AfterCatch.after.kt")
         public void testAfterCatch() throws Exception {
@@ -298,6 +302,7 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
         
         @TestMetadata("idea/testData/indentationOnNewline/script")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Script extends AbstractJetTypingIndentationTestBase {
             public void testAllFilesPresentInScript() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline/script"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
@@ -329,17 +334,12 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("DirectSettings");
-            suite.addTestSuite(DirectSettings.class);
-            suite.addTestSuite(Script.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/indentationOnNewline")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class InvertedSettings extends AbstractJetTypingIndentationTestBase {
         public void testAllFilesPresentInInvertedSettings() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true);
@@ -435,17 +435,6 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
             doNewlineTestWithInvert(fileName);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("InvertedSettings");
-            suite.addTestSuite(InvertedSettings.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetTypingIndentationTestBaseGenerated");
-        suite.addTest(DirectSettings.innerSuite());
-        suite.addTest(InvertedSettings.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.java;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/typeSubstitution")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JavaTypeSubstitutorTestGenerated extends AbstractJavaTypeSubstitutorTest {
     public void testAllFilesPresentInTypeSubstitution() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typeSubstitution"), Pattern.compile("^(.+)\\.java$"), true);

idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/expressionSelection")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest {
     public void testAllFilesPresentInExpressionSelection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/smartSelection")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest {
     public void testAllFilesPresentInSmartSelection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({InsertImportOnPasteTestGenerated.Copy.class, InsertImportOnPasteTestGenerated.Cut.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPasteTest {
     @TestMetadata("idea/testData/copyPaste/imports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Copy extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCopy() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
@@ -371,6 +375,7 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
     
     @TestMetadata("idea/testData/copyPaste/imports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Cut extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCut() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
@@ -708,10 +713,4 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("InsertImportOnPasteTestGenerated");
-        suite.addTestSuite(Copy.class);
-        suite.addTestSuite(Cut.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/intentions")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
     public void testAllFilesPresentInIntentions() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$"));

idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/codeInsight/outOfBlock")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest {
     public void testAllFilesPresentInOutOfBlock() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.moveUpDown;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({CodeMoverTestGenerated.ClassBodyDeclarations.class, CodeMoverTestGenerated.ClosingBraces.class, CodeMoverTestGenerated.Expressions.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
     @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ClassBodyDeclarations.Accessors.class, ClassBodyDeclarations.Class.class, ClassBodyDeclarations.ClassInitializer.class, ClassBodyDeclarations.Enums.class, ClassBodyDeclarations.Function.class, ClassBodyDeclarations.FunctionAnchors.class, ClassBodyDeclarations.Property.class, ClassBodyDeclarations.PropertyAnchors.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ClassBodyDeclarations extends AbstractCodeMoverTest {
         public void testAllFilesPresentInClassBodyDeclarations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -40,6 +44,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Accessors extends AbstractCodeMoverTest {
             @TestMetadata("accessor1.kt")
             public void testAccessor1() throws Exception {
@@ -73,6 +78,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Class extends AbstractCodeMoverTest {
             public void testAllFilesPresentInClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -202,6 +208,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ClassInitializer extends AbstractCodeMoverTest {
             public void testAllFilesPresentInClassInitializer() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -283,6 +290,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Enums extends AbstractCodeMoverTest {
             public void testAllFilesPresentInEnums() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -328,6 +336,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Function extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunction() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -433,6 +442,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FunctionAnchors extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunctionAnchors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -550,6 +560,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Property extends AbstractCodeMoverTest {
             public void testAllFilesPresentInProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -655,6 +666,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class PropertyAnchors extends AbstractCodeMoverTest {
             public void testAllFilesPresentInPropertyAnchors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -680,24 +692,12 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ClassBodyDeclarations");
-            suite.addTestSuite(ClassBodyDeclarations.class);
-            suite.addTestSuite(Accessors.class);
-            suite.addTestSuite(Class.class);
-            suite.addTestSuite(ClassInitializer.class);
-            suite.addTestSuite(Enums.class);
-            suite.addTestSuite(Function.class);
-            suite.addTestSuite(FunctionAnchors.class);
-            suite.addTestSuite(Property.class);
-            suite.addTestSuite(PropertyAnchors.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ClosingBraces.For.class, ClosingBraces.Function.class, ClosingBraces.If.class, ClosingBraces.Nested.class, ClosingBraces.When.class, ClosingBraces.While.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ClosingBraces extends AbstractCodeMoverTest {
         public void testAllFilesPresentInClosingBraces() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -705,6 +705,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class For extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFor() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/for"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -726,6 +727,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Function extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunction() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -759,6 +761,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class If extends AbstractCodeMoverTest {
             public void testAllFilesPresentInIf() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/if"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -792,6 +795,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Nested extends AbstractCodeMoverTest {
             public void testAllFilesPresentInNested() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/nested"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -813,6 +817,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class When extends AbstractCodeMoverTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -858,6 +863,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class While extends AbstractCodeMoverTest {
             public void testAllFilesPresentInWhile() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/while"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -889,21 +895,11 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ClosingBraces");
-            suite.addTestSuite(ClosingBraces.class);
-            suite.addTestSuite(For.class);
-            suite.addTestSuite(Function.class);
-            suite.addTestSuite(If.class);
-            suite.addTestSuite(Nested.class);
-            suite.addTestSuite(When.class);
-            suite.addTestSuite(While.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/codeInsight/moveUpDown/expressions")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Expressions extends AbstractCodeMoverTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1313,11 +1309,4 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("CodeMoverTestGenerated");
-        suite.addTest(ClassBodyDeclarations.innerSuite());
-        suite.addTest(ClosingBraces.innerSuite());
-        suite.addTestSuite(Expressions.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.surroundWith;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({SurroundWithTestGenerated.If.class, SurroundWithTestGenerated.IfElse.class, SurroundWithTestGenerated.Not.class, SurroundWithTestGenerated.Parentheses.class, SurroundWithTestGenerated.StringTemplate.class, SurroundWithTestGenerated.When.class, SurroundWithTestGenerated.TryCatch.class, SurroundWithTestGenerated.TryCatchFinally.class, SurroundWithTestGenerated.TryFinally.class, SurroundWithTestGenerated.FunctionLiteral.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestMetadata("idea/testData/codeInsight/surroundWith/if")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({If.MoveDeclarationsOut.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class If extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIf() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -71,6 +75,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({MoveDeclarationsOut.Class.class, MoveDeclarationsOut.Function.class, MoveDeclarationsOut.Object.class, MoveDeclarationsOut.Order.class, MoveDeclarationsOut.Val.class, MoveDeclarationsOut.Var.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class MoveDeclarationsOut extends AbstractSurroundWithTest {
             public void testAllFilesPresentInMoveDeclarationsOut() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -78,6 +83,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Class extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -99,6 +105,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Function extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInFunction() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -126,6 +133,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Object extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInObject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -141,6 +149,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Order extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInOrder() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -168,6 +177,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Val extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -208,6 +218,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var")
             @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Var.DefaultValue.class})
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Var extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVar() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -233,6 +244,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue")
                 @TestDataPath("$PROJECT_ROOT")
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class DefaultValue extends AbstractSurroundWithTest {
                     public void testAllFilesPresentInDefaultValue() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -258,37 +270,15 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                     
                 }
                 
-                public static Test innerSuite() {
-                    TestSuite suite = new TestSuite("Var");
-                    suite.addTestSuite(Var.class);
-                    suite.addTestSuite(DefaultValue.class);
-                    return suite;
-                }
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("MoveDeclarationsOut");
-                suite.addTestSuite(MoveDeclarationsOut.class);
-                suite.addTestSuite(Class.class);
-                suite.addTestSuite(Function.class);
-                suite.addTestSuite(Object.class);
-                suite.addTestSuite(Order.class);
-                suite.addTestSuite(Val.class);
-                suite.addTest(Var.innerSuite());
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("If");
-            suite.addTestSuite(If.class);
-            suite.addTest(MoveDeclarationsOut.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/ifElse")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class IfElse extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIfElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -340,6 +330,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/not")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Not extends AbstractSurroundWithTest {
         public void testAllFilesPresentInNot() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -392,6 +383,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Parentheses.NotApplicable.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Parentheses extends AbstractSurroundWithTest {
         public void testAllFilesPresentInParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -417,6 +409,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NotApplicable extends AbstractSurroundWithTest {
             public void testAllFilesPresentInNotApplicable() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -478,16 +471,11 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Parentheses");
-            suite.addTestSuite(Parentheses.class);
-            suite.addTestSuite(NotApplicable.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/stringTemplate")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class StringTemplate extends AbstractSurroundWithTest {
         public void testAllFilesPresentInStringTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -521,6 +509,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/when")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class When extends AbstractSurroundWithTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -548,6 +537,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatch")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TryCatch extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -575,6 +565,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TryCatchFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -596,6 +587,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryFinally")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TryFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -617,6 +609,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/functionLiteral")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class FunctionLiteral extends AbstractSurroundWithTest {
         public void testAllFilesPresentInFunctionLiteral() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -642,18 +635,4 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("SurroundWithTestGenerated");
-        suite.addTest(If.innerSuite());
-        suite.addTestSuite(IfElse.class);
-        suite.addTestSuite(Not.class);
-        suite.addTest(Parentheses.innerSuite());
-        suite.addTestSuite(StringTemplate.class);
-        suite.addTestSuite(When.class);
-        suite.addTestSuite(TryCatch.class);
-        suite.addTestSuite(TryCatchFinally.class);
-        suite.addTestSuite(TryFinally.class);
-        suite.addTestSuite(FunctionLiteral.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.unwrap;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({UnwrapRemoveTestGenerated.RemoveExpression.class, UnwrapRemoveTestGenerated.UnwrapThen.class, UnwrapRemoveTestGenerated.UnwrapElse.class, UnwrapRemoveTestGenerated.RemoveElse.class, UnwrapRemoveTestGenerated.UnwrapLoop.class, UnwrapRemoveTestGenerated.UnwrapTry.class, UnwrapRemoveTestGenerated.UnwrapCatch.class, UnwrapRemoveTestGenerated.RemoveCatch.class, UnwrapRemoveTestGenerated.UnwrapFinally.class, UnwrapRemoveTestGenerated.RemoveFinally.class, UnwrapRemoveTestGenerated.UnwrapLambda.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveExpression extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -71,6 +75,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapThen extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapThen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -98,6 +103,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -125,6 +131,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,6 +147,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapLoop extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLoop() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -167,6 +175,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapTry extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapTry() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -194,6 +203,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -221,6 +231,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -236,6 +247,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -263,6 +275,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -284,6 +297,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UnwrapLambda extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -351,19 +365,4 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("UnwrapRemoveTestGenerated");
-        suite.addTestSuite(RemoveExpression.class);
-        suite.addTestSuite(UnwrapThen.class);
-        suite.addTestSuite(UnwrapElse.class);
-        suite.addTestSuite(RemoveElse.class);
-        suite.addTestSuite(UnwrapLoop.class);
-        suite.addTestSuite(UnwrapTry.class);
-        suite.addTestSuite(UnwrapCatch.class);
-        suite.addTestSuite(RemoveCatch.class);
-        suite.addTestSuite(UnwrapFinally.class);
-        suite.addTestSuite(RemoveFinally.class);
-        suite.addTestSuite(UnwrapLambda.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.configuration;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({ConfigureProjectByChangingFileTestGenerated.Android_gradle.class, ConfigureProjectByChangingFileTestGenerated.Gradle.class, ConfigureProjectByChangingFileTestGenerated.Maven.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest {
     @TestMetadata("idea/testData/configuration/android-gradle")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Android_gradle.GradleExamples.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInAndroid_gradle() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
@@ -106,6 +110,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         
         @TestMetadata("idea/testData/configuration/android-gradle/gradleExamples")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class GradleExamples extends AbstractConfigureProjectByChangingFileTest {
             public void testAllFilesPresentInGradleExamples() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
@@ -167,16 +172,11 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Android_gradle");
-            suite.addTestSuite(Android_gradle.class);
-            suite.addTestSuite(GradleExamples.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/configuration/gradle")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInGradle() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
@@ -198,6 +198,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     
     @TestMetadata("idea/testData/configuration/maven")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Maven extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInMaven() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false);
@@ -229,11 +230,4 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("ConfigureProjectByChangingFileTestGenerated");
-        suite.addTest(Android_gradle.innerSuite());
-        suite.addTestSuite(Gradle.class);
-        suite.addTestSuite(Maven.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.conversion.copy;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/copyPaste/conversion")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest {
     public void testAllFilesPresentInConversion() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^(.+)\\.java$"), true);

idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({KotlinSteppingTestGenerated.StepInto.class, KotlinSteppingTestGenerated.SmartStepInto.class, KotlinSteppingTestGenerated.Filters.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
     @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class StepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInStepInto() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -119,6 +123,7 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SmartStepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInSmartStepInto() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -206,6 +211,7 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/filters")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Filters extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInFilters() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/filters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -273,11 +279,4 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("KotlinSteppingTestGenerated");
-        suite.addTestSuite(StepInto.class);
-        suite.addTestSuite(SmartStepInto.class);
-        suite.addTestSuite(Filters.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/debugger/smartStepInto")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest {
     public void testAllFilesPresentInSmartStepInto() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/codeFragments")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest {
     public void testAllFilesPresentInCodeFragments() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({CodeFragmentHighlightingTestGenerated.CodeFragments.class, CodeFragmentHighlightingTestGenerated.Imports.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentHighlightingTest {
     @TestMetadata("idea/testData/checker/codeFragments")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class CodeFragments extends AbstractCodeFragmentHighlightingTest {
         public void testAllFilesPresentInCodeFragments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -101,6 +105,7 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
     
     @TestMetadata("idea/testData/checker/codeFragments/imports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Imports extends AbstractCodeFragmentHighlightingTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments/imports"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -114,10 +119,4 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("CodeFragmentHighlightingTestGenerated");
-        suite.addTestSuite(CodeFragments.class);
-        suite.addTestSuite(Imports.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest {
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({SingleBreakpoint.Frame.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest {
         @TestMetadata("abstractFunCall.kt")
         public void testAbstractFunCall() throws Exception {
@@ -166,6 +170,7 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
         
         @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Frame extends AbstractKotlinEvaluateExpressionTest {
             public void testAllFilesPresentInFrame() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -257,17 +262,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("SingleBreakpoint");
-            suite.addTestSuite(SingleBreakpoint.class);
-            suite.addTestSuite(Frame.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({MultipleBreakpoints.Library.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest {
         public void testAllFilesPresentInMultipleBreakpoints() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -311,6 +311,7 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
         
         @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Library extends AbstractKotlinEvaluateExpressionTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -342,18 +343,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("MultipleBreakpoints");
-            suite.addTestSuite(MultipleBreakpoints.class);
-            suite.addTestSuite(Library.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("KotlinEvaluateExpressionTestGenerated");
-        suite.addTest(SingleBreakpoint.innerSuite());
-        suite.addTest(MultipleBreakpoints.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/debugger/selectExpression")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpressionForDebuggerTest {
     public void testAllFilesPresentInSelectExpression() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.folding;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({KotlinFoldingTestGenerated.NoCollapse.class, KotlinFoldingTestGenerated.CheckCollapse.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
     @TestMetadata("idea/testData/folding/noCollapse")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class NoCollapse extends AbstractKotlinFoldingTest {
         public void testAllFilesPresentInNoCollapse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -83,6 +87,7 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
     
     @TestMetadata("idea/testData/folding/checkCollapse")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class CheckCollapse extends AbstractKotlinFoldingTest {
         public void testAllFilesPresentInCheckCollapse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -108,10 +113,4 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("KotlinFoldingTestGenerated");
-        suite.addTestSuite(NoCollapse.class);
-        suite.addTestSuite(CheckCollapse.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.hierarchy;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({HierarchyTestGenerated.Type.class, HierarchyTestGenerated.Super.class, HierarchyTestGenerated.Sub.class, HierarchyTestGenerated.Callers.class, HierarchyTestGenerated.Callees.class, HierarchyTestGenerated.Overrides.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestMetadata("idea/testData/hierarchy/class/type")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Type extends AbstractHierarchyTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false);
@@ -203,6 +207,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     
     @TestMetadata("idea/testData/hierarchy/class/super")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Super extends AbstractHierarchyTest {
         public void testAllFilesPresentInSuper() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false);
@@ -224,6 +229,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     
     @TestMetadata("idea/testData/hierarchy/class/sub")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Sub extends AbstractHierarchyTest {
         public void testAllFilesPresentInSub() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false);
@@ -281,6 +287,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     
     @TestMetadata("idea/testData/hierarchy/calls/callers")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Callers extends AbstractHierarchyTest {
         public void testAllFilesPresentInCallers() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false);
@@ -374,6 +381,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     
     @TestMetadata("idea/testData/hierarchy/calls/callees")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Callees extends AbstractHierarchyTest {
         public void testAllFilesPresentInCallees() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false);
@@ -467,6 +475,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
     
     @TestMetadata("idea/testData/hierarchy/overrides")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Overrides extends AbstractHierarchyTest {
         public void testAllFilesPresentInOverrides() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), false);
@@ -510,14 +519,4 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("HierarchyTestGenerated");
-        suite.addTestSuite(Type.class);
-        suite.addTestSuite(Super.class);
-        suite.addTestSuite(Sub.class);
-        suite.addTestSuite(Callers.class);
-        suite.addTestSuite(Callees.class);
-        suite.addTestSuite(Overrides.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.highlighter;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/diagnosticMessage")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTest {
     public void testAllFilesPresentInDiagnosticMessage() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.highlighter;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/highlighter")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({HighlightingTestGenerated.Deprecated.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class HighlightingTestGenerated extends AbstractHighlightingTest {
     public void testAllFilesPresentInHighlighter() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,6 +83,7 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest {
     
     @TestMetadata("idea/testData/highlighter/deprecated")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Deprecated extends AbstractHighlightingTest {
         public void testAllFilesPresentInDeprecated() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -171,10 +175,4 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("HighlightingTestGenerated");
-        suite.addTestSuite(HighlightingTestGenerated.class);
-        suite.addTestSuite(Deprecated.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.imports;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/editor/optimizeImports")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
     public void testAllFilesPresentInOptimizeImports() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)$"), false);

idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.intentions;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/intentions")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({IntentionTestGenerated.AddBraces.class, IntentionTestGenerated.AttributeCallReplacements.class, IntentionTestGenerated.Branched.class, IntentionTestGenerated.ConvertAssertToIf.class, IntentionTestGenerated.ConvertIfToAssert.class, IntentionTestGenerated.ConvertNegatedBooleanSequence.class, IntentionTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, IntentionTestGenerated.ConvertToBlockBody.class, IntentionTestGenerated.ConvertToConcatenatedStringIntention.class, IntentionTestGenerated.ConvertToExpressionBody.class, IntentionTestGenerated.ConvertToForEachFunctionCall.class, IntentionTestGenerated.ConvertToForEachLoop.class, IntentionTestGenerated.ConvertToStringTemplateIntention.class, IntentionTestGenerated.Declarations.class, IntentionTestGenerated.InsertCurlyBracesToTemplate.class, IntentionTestGenerated.InsertExplicitTypeArguments.class, IntentionTestGenerated.InvertIfCondition.class, IntentionTestGenerated.MakeTypeExplicitInLambda.class, IntentionTestGenerated.MakeTypeImplicitInLambda.class, IntentionTestGenerated.MoveLambdaInsideParentheses.class, IntentionTestGenerated.MoveLambdaOutsideParentheses.class, IntentionTestGenerated.OperatorToFunction.class, IntentionTestGenerated.ReconstructedType.class, IntentionTestGenerated.RemoveBraces.class, IntentionTestGenerated.RemoveCurlyBracesFromTemplate.class, IntentionTestGenerated.RemoveExplicitTypeArguments.class, IntentionTestGenerated.RemoveUnnecessaryParentheses.class, IntentionTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, IntentionTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, IntentionTestGenerated.ReplaceWithDotQualifiedMethodCall.class, IntentionTestGenerated.ReplaceWithInfixFunctionCall.class, IntentionTestGenerated.ReplaceWithOperatorAssign.class, IntentionTestGenerated.ReplaceWithTraditionalAssignment.class, IntentionTestGenerated.SimplifyBooleanWithConstants.class, IntentionTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, IntentionTestGenerated.SpecifyType.class, IntentionTestGenerated.SplitIf.class, IntentionTestGenerated.SwapBinaryExpression.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class IntentionTestGenerated extends AbstractIntentionTest {
     public void testAllFilesPresentInIntentions() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -38,6 +41,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/addBraces")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AddBraces extends AbstractIntentionTest {
         @TestMetadata("addBracesForDoWhile.kt")
         public void testAddBracesForDoWhile() throws Exception {
@@ -96,6 +100,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestMetadata("idea/testData/intentions/attributeCallReplacements")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({AttributeCallReplacements.ReplaceBinaryInfixIntention.class, AttributeCallReplacements.ReplaceContainsIntention.class, AttributeCallReplacements.ReplaceGetIntention.class, AttributeCallReplacements.ReplaceInvokeIntention.class, AttributeCallReplacements.ReplaceUnaryPrefixIntention.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AttributeCallReplacements extends AbstractIntentionTest {
         public void testAllFilesPresentInAttributeCallReplacements() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/attributeCallReplacements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -103,6 +108,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ReplaceBinaryInfixIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg1.kt")
             public void testAcceptableVararg1() throws Exception {
@@ -214,6 +220,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ReplaceContainsIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
@@ -332,6 +339,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ReplaceGetIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
@@ -433,15 +441,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("ReplaceGetIntention");
-                suite.addTestSuite(ReplaceGetIntention.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ReplaceInvokeIntention extends AbstractIntentionTest {
             public void testAllFilesPresentInReplaceInvokeIntention() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -511,6 +515,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ReplaceUnaryPrefixIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
@@ -596,21 +601,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("AttributeCallReplacements");
-            suite.addTestSuite(AttributeCallReplacements.class);
-            suite.addTestSuite(ReplaceBinaryInfixIntention.class);
-            suite.addTestSuite(ReplaceContainsIntention.class);
-            suite.addTest(ReplaceGetIntention.innerSuite());
-            suite.addTestSuite(ReplaceInvokeIntention.class);
-            suite.addTestSuite(ReplaceUnaryPrefixIntention.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/intentions/branched")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Branched.DoubleBangToIfThen.class, Branched.ElvisToIfThen.class, Branched.Folding.class, Branched.IfThenToDoubleBang.class, Branched.IfThenToElvis.class, Branched.IfThenToSafeAccess.class, Branched.IfWhen.class, Branched.SafeAccessToIfThen.class, Branched.Unfolding.class, Branched.When.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Branched extends AbstractIntentionTest {
         public void testAllFilesPresentInBranched() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -618,6 +614,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class DoubleBangToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInDoubleBangToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/doubleBangToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -699,6 +696,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/branched/elvisToIfThen")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ElvisToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInElvisToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/elvisToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -775,6 +773,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         @TestMetadata("idea/testData/intentions/branched/folding")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Folding.IfToAssignment.class, Folding.IfToReturn.class, Folding.IfToReturnAsymmetrically.class, Folding.WhenToAssignment.class, Folding.WhenToReturn.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Folding extends AbstractIntentionTest {
             public void testAllFilesPresentInFolding() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -782,6 +781,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class IfToAssignment extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToAssignment() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -845,6 +845,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToReturn")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class IfToReturn extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -872,6 +873,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class IfToReturnAsymmetrically extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToReturnAsymmetrically() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -899,6 +901,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/folding/whenToAssignment")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class WhenToAssignment extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToAssignment() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -944,6 +947,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/folding/whenToReturn")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class WhenToReturn extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -969,20 +973,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("Folding");
-                suite.addTestSuite(Folding.class);
-                suite.addTestSuite(IfToAssignment.class);
-                suite.addTestSuite(IfToReturn.class);
-                suite.addTestSuite(IfToReturnAsymmetrically.class);
-                suite.addTestSuite(WhenToAssignment.class);
-                suite.addTestSuite(WhenToReturn.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifThenToDoubleBang")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class IfThenToDoubleBang extends AbstractIntentionTest {
             @TestMetadata("acceptableEmptyElseBlockForStatement.kt")
             public void testAcceptableEmptyElseBlockForStatement() throws Exception {
@@ -1197,6 +1192,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         @TestMetadata("idea/testData/intentions/branched/ifThenToElvis")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class IfThenToElvis extends AbstractIntentionTest {
             public void testAllFilesPresentInIfThenToElvis() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1388,16 +1384,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("IfThenToElvis");
-                suite.addTestSuite(IfThenToElvis.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class IfThenToSafeAccess extends AbstractIntentionTest {
             public void testAllFilesPresentInIfThenToSafeAccess() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToSafeAccess"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1607,16 +1599,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("IfThenToSafeAccess");
-                suite.addTestSuite(IfThenToSafeAccess.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifWhen")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({IfWhen.IfToWhen.class, IfWhen.WhenToIf.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class IfWhen extends AbstractIntentionTest {
             public void testAllFilesPresentInIfWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1624,6 +1612,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class IfToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1693,6 +1682,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/ifWhen/whenToIf")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class WhenToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1766,17 +1756,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("IfWhen");
-                suite.addTestSuite(IfWhen.class);
-                suite.addTestSuite(IfToWhen.class);
-                suite.addTestSuite(WhenToIf.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/branched/safeAccessToIfThen")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class SafeAccessToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInSafeAccessToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/safeAccessToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1919,6 +1903,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         @TestMetadata("idea/testData/intentions/branched/unfolding")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Unfolding.AssignmentToIf.class, Unfolding.AssignmentToWhen.class, Unfolding.PropertyToIf.class, Unfolding.PropertyToWhen.class, Unfolding.ReturnToIf.class, Unfolding.ReturnToWhen.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Unfolding extends AbstractIntentionTest {
             public void testAllFilesPresentInUnfolding() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1926,6 +1911,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class AssignmentToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInAssignmentToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1977,6 +1963,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class AssignmentToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInAssignmentToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2010,6 +1997,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToIf")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class PropertyToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInPropertyToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2073,6 +2061,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class PropertyToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInPropertyToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2124,6 +2113,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/returnToIf")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class ReturnToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInReturnToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2151,6 +2141,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/returnToWhen")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class ReturnToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInReturnToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2176,22 +2167,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("Unfolding");
-                suite.addTestSuite(Unfolding.class);
-                suite.addTestSuite(AssignmentToIf.class);
-                suite.addTestSuite(AssignmentToWhen.class);
-                suite.addTestSuite(PropertyToIf.class);
-                suite.addTestSuite(PropertyToWhen.class);
-                suite.addTestSuite(ReturnToIf.class);
-                suite.addTestSuite(ReturnToWhen.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/intentions/branched/when")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({When.EliminateSubject.class, When.Flatten.class, When.IntroduceSubject.class, When.Merge.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class When extends AbstractIntentionTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2199,6 +2180,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/when/eliminateSubject")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class EliminateSubject extends AbstractIntentionTest {
                 public void testAllFilesPresentInEliminateSubject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2256,6 +2238,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/when/flatten")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Flatten extends AbstractIntentionTest {
                 public void testAllFilesPresentInFlatten() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2283,6 +2266,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/when/introduceSubject")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class IntroduceSubject extends AbstractIntentionTest {
                 public void testAllFilesPresentInIntroduceSubject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2358,6 +2342,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("idea/testData/intentions/branched/when/merge")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Merge extends AbstractIntentionTest {
                 public void testAllFilesPresentInMerge() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2467,36 +2452,13 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("When");
-                suite.addTestSuite(When.class);
-                suite.addTestSuite(EliminateSubject.class);
-                suite.addTestSuite(Flatten.class);
-                suite.addTestSuite(IntroduceSubject.class);
-                suite.addTestSuite(Merge.class);
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Branched");
-            suite.addTestSuite(Branched.class);
-            suite.addTestSuite(DoubleBangToIfThen.class);
-            suite.addTestSuite(ElvisToIfThen.class);
-            suite.addTest(Folding.innerSuite());
-            suite.addTestSuite(IfThenToDoubleBang.class);
-            suite.addTest(IfThenToElvis.innerSuite());
-            suite.addTest(IfThenToSafeAccess.innerSuite());
-            suite.addTest(IfWhen.innerSuite());
-            suite.addTestSuite(SafeAccessToIfThen.class);
-            suite.addTest(Unfolding.innerSuite());
-            suite.addTest(When.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/intentions/convertAssertToIf")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertAssertToIf extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertAssertToIf() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertAssertToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2620,6 +2582,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertIfToAssert")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertIfToAssert extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertIfToAssert() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfToAssert"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2707,6 +2670,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertNegatedBooleanSequence")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertNegatedBooleanSequence extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertNegatedBooleanSequence() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedBooleanSequence"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2776,6 +2740,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertNegatedExpressionWithDemorgansLaw extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertNegatedExpressionWithDemorgansLaw() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2869,6 +2834,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToBlockBody")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToBlockBody extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToBlockBody() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2956,6 +2922,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToConcatenatedStringIntention")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToConcatenatedStringIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToConcatenatedStringIntention() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToConcatenatedStringIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3109,6 +3076,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToExpressionBody")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToExpressionBody extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToExpressionBody() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3220,6 +3188,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToForEachFunctionCall")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToForEachFunctionCall extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToForEachFunctionCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3271,6 +3240,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToForEachLoop")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToForEachLoop extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToForEachLoop() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachLoop"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3340,6 +3310,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/convertToStringTemplateIntention")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ConvertToStringTemplateIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToStringTemplateIntention() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToStringTemplateIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3512,6 +3483,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestMetadata("idea/testData/intentions/declarations")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Declarations.ConvertMemberToExtension.class, Declarations.Split.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Declarations extends AbstractIntentionTest {
         public void testAllFilesPresentInDeclarations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3519,6 +3491,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/declarations/convertMemberToExtension")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ConvertMemberToExtension extends AbstractIntentionTest {
             @TestMetadata("abstract.kt")
             public void testAbstract() throws Exception {
@@ -3738,6 +3711,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("idea/testData/intentions/declarations/split")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Split extends AbstractIntentionTest {
             public void testAllFilesPresentInSplit() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3817,17 +3791,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Declarations");
-            suite.addTestSuite(Declarations.class);
-            suite.addTestSuite(ConvertMemberToExtension.class);
-            suite.addTestSuite(Split.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/intentions/insertCurlyBracesToTemplate")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class InsertCurlyBracesToTemplate extends AbstractIntentionTest {
         public void testAllFilesPresentInInsertCurlyBracesToTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertCurlyBracesToTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3873,6 +3841,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/insertExplicitTypeArguments")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class InsertExplicitTypeArguments extends AbstractIntentionTest {
         public void testAllFilesPresentInInsertExplicitTypeArguments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3996,6 +3965,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/invertIfCondition")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class InvertIfCondition extends AbstractIntentionTest {
         public void testAllFilesPresentInInvertIfCondition() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/invertIfCondition"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4083,6 +4053,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/makeTypeExplicitInLambda")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class MakeTypeExplicitInLambda extends AbstractIntentionTest {
         public void testAllFilesPresentInMakeTypeExplicitInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeExplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4200,6 +4171,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/makeTypeImplicitInLambda")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class MakeTypeImplicitInLambda extends AbstractIntentionTest {
         public void testAllFilesPresentInMakeTypeImplicitInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeImplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4263,6 +4235,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/moveLambdaInsideParentheses")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class MoveLambdaInsideParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInMoveLambdaInsideParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaInsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4368,6 +4341,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/moveLambdaOutsideParentheses")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class MoveLambdaOutsideParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInMoveLambdaOutsideParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaOutsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4455,6 +4429,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/operatorToFunction")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class OperatorToFunction extends AbstractIntentionTest {
         public void testAllFilesPresentInOperatorToFunction() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/operatorToFunction"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4584,6 +4559,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/reconstructedType")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReconstructedType extends AbstractIntentionTest {
         public void testAllFilesPresentInReconstructedType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/reconstructedType"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4623,6 +4599,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/removeBraces")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveBraces extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveBraces() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeBraces"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4704,6 +4681,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveCurlyBracesFromTemplate extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4780,6 +4758,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveExplicitTypeArguments extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4899,15 +4878,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("RemoveExplicitTypeArguments");
-            suite.addTestSuite(RemoveExplicitTypeArguments.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/intentions/removeUnnecessaryParentheses")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class RemoveUnnecessaryParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveUnnecessaryParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4995,6 +4970,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceExplicitFunctionLiteralParamWithIt extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceExplicitFunctionLiteralParamWithIt() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5052,6 +5028,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceItWithExplicitFunctionLiteralParam extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceItWithExplicitFunctionLiteralParam() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5091,6 +5068,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceWithDotQualifiedMethodCall extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithDotQualifiedMethodCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithDotQualifiedMethodCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5136,6 +5114,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceWithInfixFunctionCall")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceWithInfixFunctionCall extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithInfixFunctionCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithInfixFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5259,6 +5238,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceWithOperatorAssign")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceWithOperatorAssign extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithOperatorAssign() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssign"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5322,6 +5302,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/replaceWithTraditionalAssignment")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ReplaceWithTraditionalAssignment extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithTraditionalAssignment() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithTraditionalAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5355,6 +5336,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/simplifyBooleanWithConstants")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SimplifyBooleanWithConstants extends AbstractIntentionTest {
         public void testAllFilesPresentInSimplifyBooleanWithConstants() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyBooleanWithConstants"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5485,6 +5467,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SimplifyNegatedBinaryExpressionIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5562,15 +5545,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("SimplifyNegatedBinaryExpressionIntention");
-            suite.addTestSuite(SimplifyNegatedBinaryExpressionIntention.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/intentions/specifyType")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SpecifyType extends AbstractIntentionTest {
         public void testAllFilesPresentInSpecifyType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyType"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5652,6 +5631,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/splitIf")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SplitIf extends AbstractIntentionTest {
         public void testAllFilesPresentInSplitIf() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5805,6 +5785,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     
     @TestMetadata("idea/testData/intentions/swapBinaryExpression")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SwapBinaryExpression extends AbstractIntentionTest {
         public void testAllFilesPresentInSwapBinaryExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/swapBinaryExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -6118,47 +6099,4 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("IntentionTestGenerated");
-        suite.addTestSuite(IntentionTestGenerated.class);
-        suite.addTestSuite(AddBraces.class);
-        suite.addTest(AttributeCallReplacements.innerSuite());
-        suite.addTest(Branched.innerSuite());
-        suite.addTestSuite(ConvertAssertToIf.class);
-        suite.addTestSuite(ConvertIfToAssert.class);
-        suite.addTestSuite(ConvertNegatedBooleanSequence.class);
-        suite.addTestSuite(ConvertNegatedExpressionWithDemorgansLaw.class);
-        suite.addTestSuite(ConvertToBlockBody.class);
-        suite.addTestSuite(ConvertToConcatenatedStringIntention.class);
-        suite.addTestSuite(ConvertToExpressionBody.class);
-        suite.addTestSuite(ConvertToForEachFunctionCall.class);
-        suite.addTestSuite(ConvertToForEachLoop.class);
-        suite.addTestSuite(ConvertToStringTemplateIntention.class);
-        suite.addTest(Declarations.innerSuite());
-        suite.addTestSuite(InsertCurlyBracesToTemplate.class);
-        suite.addTestSuite(InsertExplicitTypeArguments.class);
-        suite.addTestSuite(InvertIfCondition.class);
-        suite.addTestSuite(MakeTypeExplicitInLambda.class);
-        suite.addTestSuite(MakeTypeImplicitInLambda.class);
-        suite.addTestSuite(MoveLambdaInsideParentheses.class);
-        suite.addTestSuite(MoveLambdaOutsideParentheses.class);
-        suite.addTestSuite(OperatorToFunction.class);
-        suite.addTestSuite(ReconstructedType.class);
-        suite.addTestSuite(RemoveBraces.class);
-        suite.addTestSuite(RemoveCurlyBracesFromTemplate.class);
-        suite.addTest(RemoveExplicitTypeArguments.innerSuite());
-        suite.addTestSuite(RemoveUnnecessaryParentheses.class);
-        suite.addTestSuite(ReplaceExplicitFunctionLiteralParamWithIt.class);
-        suite.addTestSuite(ReplaceItWithExplicitFunctionLiteralParam.class);
-        suite.addTestSuite(ReplaceWithDotQualifiedMethodCall.class);
-        suite.addTestSuite(ReplaceWithInfixFunctionCall.class);
-        suite.addTestSuite(ReplaceWithOperatorAssign.class);
-        suite.addTestSuite(ReplaceWithTraditionalAssignment.class);
-        suite.addTestSuite(SimplifyBooleanWithConstants.class);
-        suite.addTest(SimplifyNegatedBinaryExpressionIntention.innerSuite());
-        suite.addTestSuite(SpecifyType.class);
-        suite.addTestSuite(SplitIf.class);
-        suite.addTestSuite(SwapBinaryExpression.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.intentions.declarations;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/joinLines")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
     public void testAllFilesPresentInJoinLines() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.libraries;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/libraries/decompiledText")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest {
     public void testAllFilesPresentInDecompiledText() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/libraries/decompiledText"), Pattern.compile("^([^\\.]+)$"), true);
@@ -84,9 +87,4 @@ public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest {
         doTest(fileName);
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("DecompiledTextTestGenerated");
-        suite.addTestSuite(DecompiledTextTestGenerated.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.navigation;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/navigation/gotoSuper")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
     public void testAllFilesPresentInGotoSuper() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true);

idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.navigation;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({KotlinGotoTestGenerated.GotoClass.class, KotlinGotoTestGenerated.GotoSymbol.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
     @TestMetadata("idea/testData/navigation/gotoClass")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class GotoClass extends AbstractKotlinGotoTest {
         public void testAllFilesPresentInGotoClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -89,6 +93,7 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
     
     @TestMetadata("idea/testData/navigation/gotoSymbol")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class GotoSymbol extends AbstractKotlinGotoTest {
         public void testAllFilesPresentInGotoSymbol() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -132,10 +137,4 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("KotlinGotoTestGenerated");
-        suite.addTestSuite(GotoClass.class);
-        suite.addTestSuite(GotoSymbol.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.parameterInfo;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/parameterInfo/functionParameterInfo")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class FunctionParameterInfoTestGenerated extends AbstractFunctionParameterInfoTest {
     public void testAllFilesPresentInFunctionParameterInfo() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionParameterInfo"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.quickfix;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/quickfix")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.CreateFromUsage.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.Nullables.class, QuickFixMultiFileTestGenerated.Override.class, QuickFixMultiFileTestGenerated.Suppress.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.TypeMismatch.class, QuickFixMultiFileTestGenerated.Variables.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -39,20 +42,17 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     @TestMetadata("idea/testData/quickfix/addStarProjections")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AddStarProjections extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInAddStarProjections() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("AddStarProjections");
-            suite.addTestSuite(AddStarProjections.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/autoImports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AutoImports extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInAutoImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -213,21 +213,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     @TestMetadata("idea/testData/quickfix/createFromUsage")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class CreateFromUsage extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInCreateFromUsage() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("CreateFromUsage");
-            suite.addTestSuite(CreateFromUsage.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/modifiers")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Modifiers extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInModifiers() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -236,6 +233,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class AddOpenToClassDeclaration extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -244,6 +242,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass")
             @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({FinalJavaClass.JavaCode.class})
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class FinalJavaClass extends AbstractQuickFixMultiFileTest {
                 public void testAllFilesPresentInFinalJavaClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -252,60 +251,35 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
                 @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode")
                 @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({})
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class JavaCode extends AbstractQuickFixMultiFileTest {
                     public void testAllFilesPresentInJavaCode() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
                     }
                     
-                    public static Test innerSuite() {
-                        TestSuite suite = new TestSuite("JavaCode");
-                        suite.addTestSuite(JavaCode.class);
-                        return suite;
-                    }
                 }
                 
-                public static Test innerSuite() {
-                    TestSuite suite = new TestSuite("FinalJavaClass");
-                    suite.addTestSuite(FinalJavaClass.class);
-                    suite.addTest(JavaCode.innerSuite());
-                    return suite;
-                }
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("AddOpenToClassDeclaration");
-                suite.addTestSuite(AddOpenToClassDeclaration.class);
-                suite.addTest(FinalJavaClass.innerSuite());
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Modifiers");
-            suite.addTestSuite(Modifiers.class);
-            suite.addTest(AddOpenToClassDeclaration.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/nullables")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Nullables extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInNullables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Nullables");
-            suite.addTestSuite(Nullables.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/override")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Override.NothingToOverride.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Override extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInOverride() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -313,6 +287,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         
         @TestMetadata("idea/testData/quickfix/override/nothingToOverride")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NothingToOverride extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInNothingToOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -332,17 +307,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Override");
-            suite.addTestSuite(Override.class);
-            suite.addTestSuite(NothingToOverride.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/suppress")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Suppress.ForStatement.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Suppress extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInSuppress() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -351,28 +321,19 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         @TestMetadata("idea/testData/quickfix/suppress/forStatement")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ForStatement extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInForStatement() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("ForStatement");
-                suite.addTestSuite(ForStatement.class);
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Suppress");
-            suite.addTestSuite(Suppress.class);
-            suite.addTest(ForStatement.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/typeImports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeImports extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInTypeImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -389,46 +350,23 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     @TestMetadata("idea/testData/quickfix/typeMismatch")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeMismatch extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInTypeMismatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("TypeMismatch");
-            suite.addTestSuite(TypeMismatch.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/variables")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Variables extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInVariables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Variables");
-            suite.addTestSuite(Variables.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("QuickFixMultiFileTestGenerated");
-        suite.addTestSuite(QuickFixMultiFileTestGenerated.class);
-        suite.addTest(AddStarProjections.innerSuite());
-        suite.addTestSuite(AutoImports.class);
-        suite.addTest(CreateFromUsage.innerSuite());
-        suite.addTest(Modifiers.innerSuite());
-        suite.addTest(Nullables.innerSuite());
-        suite.addTest(Override.innerSuite());
-        suite.addTest(Suppress.innerSuite());
-        suite.addTestSuite(TypeImports.class);
-        suite.addTest(TypeMismatch.innerSuite());
-        suite.addTest(Variables.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.quickfix;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/quickfix")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({QuickFixTestGenerated.Abstract.class, QuickFixTestGenerated.AddStarProjections.class, QuickFixTestGenerated.AutoImports.class, QuickFixTestGenerated.ChangeSignature.class, QuickFixTestGenerated.CheckArguments.class, QuickFixTestGenerated.CreateFromUsage.class, QuickFixTestGenerated.Expressions.class, QuickFixTestGenerated.Migration.class, QuickFixTestGenerated.Modifiers.class, QuickFixTestGenerated.Nullables.class, QuickFixTestGenerated.Override.class, QuickFixTestGenerated.PlatformClasses.class, QuickFixTestGenerated.Supercalls.class, QuickFixTestGenerated.SupertypeInitialization.class, QuickFixTestGenerated.Suppress.class, QuickFixTestGenerated.TypeAddition.class, QuickFixTestGenerated.TypeImports.class, QuickFixTestGenerated.TypeMismatch.class, QuickFixTestGenerated.TypeProjection.class, QuickFixTestGenerated.UselessImports.class, QuickFixTestGenerated.Variables.class, QuickFixTestGenerated.When.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class QuickFixTestGenerated extends AbstractQuickFixTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -38,6 +41,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/abstract")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Abstract extends AbstractQuickFixTest {
         @TestMetadata("beforeAbstractFunctionInNonAbstractClass.kt")
         public void testAbstractFunctionInNonAbstractClass() throws Exception {
@@ -168,6 +172,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/addStarProjections")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({AddStarProjections.Cast.class, AddStarProjections.CheckType.class, AddStarProjections.JavaClass.class, AddStarProjections.When.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AddStarProjections extends AbstractQuickFixTest {
         public void testAllFilesPresentInAddStarProjections() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -211,6 +216,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/cast")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Cast extends AbstractQuickFixTest {
             public void testAllFilesPresentInCast() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -232,6 +238,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/checkType")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class CheckType extends AbstractQuickFixTest {
             public void testAllFilesPresentInCheckType() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -259,6 +266,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/javaClass")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class JavaClass extends AbstractQuickFixTest {
             public void testAllFilesPresentInJavaClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -292,6 +300,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/when")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class When extends AbstractQuickFixTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -335,19 +344,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("AddStarProjections");
-            suite.addTestSuite(AddStarProjections.class);
-            suite.addTestSuite(Cast.class);
-            suite.addTestSuite(CheckType.class);
-            suite.addTestSuite(JavaClass.class);
-            suite.addTestSuite(When.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/autoImports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AutoImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInAutoImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -423,6 +424,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/changeSignature")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ChangeSignature extends AbstractQuickFixTest {
         @TestMetadata("beforeAddConstructorParameter.kt")
         public void testAddConstructorParameter() throws Exception {
@@ -558,6 +560,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/checkArguments")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class CheckArguments extends AbstractQuickFixTest {
         public void testAllFilesPresentInCheckArguments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -616,6 +619,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/createFromUsage")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CreateFromUsage.Component.class, CreateFromUsage.Get.class, CreateFromUsage.HasNext.class, CreateFromUsage.Iterator.class, CreateFromUsage.Next.class, CreateFromUsage.Set.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class CreateFromUsage extends AbstractQuickFixTest {
         public void testAllFilesPresentInCreateFromUsage() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -623,6 +627,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/component")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Component extends AbstractQuickFixTest {
             public void testAllFilesPresentInComponent() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/component"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -650,6 +655,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/get")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Get extends AbstractQuickFixTest {
             public void testAllFilesPresentInGet() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/get"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -731,6 +737,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/hasNext")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class HasNext extends AbstractQuickFixTest {
             public void testAllFilesPresentInHasNext() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/hasNext"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -752,6 +759,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/iterator")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Iterator extends AbstractQuickFixTest {
             public void testAllFilesPresentInIterator() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/iterator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -779,6 +787,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/next")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Next extends AbstractQuickFixTest {
             public void testAllFilesPresentInNext() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/next"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -800,6 +809,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/set")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Set extends AbstractQuickFixTest {
             public void testAllFilesPresentInSet() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/set"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -819,21 +829,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("CreateFromUsage");
-            suite.addTestSuite(CreateFromUsage.class);
-            suite.addTestSuite(Component.class);
-            suite.addTestSuite(Get.class);
-            suite.addTestSuite(HasNext.class);
-            suite.addTestSuite(Iterator.class);
-            suite.addTestSuite(Next.class);
-            suite.addTestSuite(Set.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/expressions")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Expressions extends AbstractQuickFixTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -909,6 +909,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/migration")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Migration extends AbstractQuickFixTest {
         @TestMetadata("beforeAddOverrideToEqualsHashCodeToString.kt")
         public void testAddOverrideToEqualsHashCodeToString() throws Exception {
@@ -931,6 +932,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/modifiers")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Modifiers extends AbstractQuickFixTest {
         @TestMetadata("beforeAddInnerModifier.kt")
         public void testAddInnerModifier() throws Exception {
@@ -1071,6 +1073,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class AddOpenToClassDeclaration extends AbstractQuickFixTest {
             public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1133,6 +1136,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass")
             @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({FinalJavaClass.JavaCode.class})
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class FinalJavaClass extends AbstractQuickFixTest {
                 public void testAllFilesPresentInFinalJavaClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1141,45 +1145,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode")
                 @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({})
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class JavaCode extends AbstractQuickFixTest {
                     public void testAllFilesPresentInJavaCode() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^before(\\w+)\\.kt$"), true);
                     }
                     
-                    public static Test innerSuite() {
-                        TestSuite suite = new TestSuite("JavaCode");
-                        suite.addTestSuite(JavaCode.class);
-                        return suite;
-                    }
                 }
                 
-                public static Test innerSuite() {
-                    TestSuite suite = new TestSuite("FinalJavaClass");
-                    suite.addTestSuite(FinalJavaClass.class);
-                    suite.addTest(JavaCode.innerSuite());
-                    return suite;
-                }
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("AddOpenToClassDeclaration");
-                suite.addTestSuite(AddOpenToClassDeclaration.class);
-                suite.addTest(FinalJavaClass.innerSuite());
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Modifiers");
-            suite.addTestSuite(Modifiers.class);
-            suite.addTest(AddOpenToClassDeclaration.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/nullables")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Nullables.UnsafeInfixCall.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Nullables extends AbstractQuickFixTest {
         public void testAllFilesPresentInNullables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1211,6 +1194,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/nullables/unsafeInfixCall")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class UnsafeInfixCall extends AbstractQuickFixTest {
             public void testAllFilesPresentInUnsafeInfixCall() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1224,17 +1208,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Nullables");
-            suite.addTestSuite(Nullables.class);
-            suite.addTestSuite(UnsafeInfixCall.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/override")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Override.NothingToOverride.class, Override.TypeMismatchOnOverride.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Override extends AbstractQuickFixTest {
         public void testAllFilesPresentInOverride() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1320,6 +1299,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/override/nothingToOverride")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NothingToOverride extends AbstractQuickFixTest {
             @TestMetadata("beforeAddFunction.kt")
             public void testAddFunction() throws Exception {
@@ -1503,6 +1483,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/override/typeMismatchOnOverride")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class TypeMismatchOnOverride extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1612,17 +1593,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Override");
-            suite.addTestSuite(Override.class);
-            suite.addTestSuite(NothingToOverride.class);
-            suite.addTestSuite(TypeMismatchOnOverride.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/platformClasses")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class PlatformClasses extends AbstractQuickFixTest {
         public void testAllFilesPresentInPlatformClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1656,6 +1631,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/supercalls")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Supercalls extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupercalls() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1671,6 +1647,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/supertypeInitialization")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class SupertypeInitialization extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupertypeInitialization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1711,6 +1688,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/suppress")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Suppress.AnnotationPosition.class, Suppress.Availability.class, Suppress.DeclarationKinds.class, Suppress.ErrorRecovery.class, Suppress.ForStatement.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Suppress extends AbstractQuickFixTest {
         public void testAllFilesPresentInSuppress() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1718,6 +1696,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/suppress/annotationPosition")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class AnnotationPosition extends AbstractQuickFixTest {
             public void testAllFilesPresentInAnnotationPosition() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1799,6 +1778,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/suppress/availability")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Availability extends AbstractQuickFixTest {
             public void testAllFilesPresentInAvailability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1868,6 +1848,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/suppress/declarationKinds")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class DeclarationKinds extends AbstractQuickFixTest {
             public void testAllFilesPresentInDeclarationKinds() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1943,6 +1924,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/suppress/errorRecovery")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ErrorRecovery extends AbstractQuickFixTest {
             public void testAllFilesPresentInErrorRecovery() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1965,6 +1947,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @TestMetadata("idea/testData/quickfix/suppress/forStatement")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ForStatement.Unavailable.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ForStatement extends AbstractQuickFixTest {
             public void testAllFilesPresentInForStatement() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2206,6 +2189,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("idea/testData/quickfix/suppress/forStatement/unavailable")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Unavailable extends AbstractQuickFixTest {
                 public void testAllFilesPresentInUnavailable() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2279,28 +2263,13 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("ForStatement");
-                suite.addTestSuite(ForStatement.class);
-                suite.addTestSuite(Unavailable.class);
-                return suite;
-            }
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Suppress");
-            suite.addTestSuite(Suppress.class);
-            suite.addTestSuite(AnnotationPosition.class);
-            suite.addTestSuite(Availability.class);
-            suite.addTestSuite(DeclarationKinds.class);
-            suite.addTestSuite(ErrorRecovery.class);
-            suite.addTest(ForStatement.innerSuite());
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/typeAddition")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeAddition extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeAddition() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2382,6 +2351,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/typeImports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2422,6 +2392,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/typeMismatch")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({TypeMismatch.Casts.class, TypeMismatch.ComponentFunctionReturnTypeMismatch.class, TypeMismatch.FixOverloadedOperator.class, TypeMismatch.ParameterTypeMismatch.class, TypeMismatch.TypeMismatchOnReturnedExpression.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeMismatch extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeMismatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2507,6 +2478,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/casts")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Casts extends AbstractQuickFixTest {
             public void testAllFilesPresentInCasts() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2570,6 +2542,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ComponentFunctionReturnTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInComponentFunctionReturnTypeMismatch() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2609,6 +2582,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class FixOverloadedOperator extends AbstractQuickFixTest {
             public void testAllFilesPresentInFixOverloadedOperator() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2636,6 +2610,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ParameterTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInParameterTypeMismatch() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2687,6 +2662,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class TypeMismatchOnReturnedExpression extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnReturnedExpression() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2790,20 +2766,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("TypeMismatch");
-            suite.addTestSuite(TypeMismatch.class);
-            suite.addTestSuite(Casts.class);
-            suite.addTestSuite(ComponentFunctionReturnTypeMismatch.class);
-            suite.addTestSuite(FixOverloadedOperator.class);
-            suite.addTestSuite(ParameterTypeMismatch.class);
-            suite.addTestSuite(TypeMismatchOnReturnedExpression.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/typeProjection")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class TypeProjection extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeProjection() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2855,6 +2822,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     
     @TestMetadata("idea/testData/quickfix/uselessImports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class UselessImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInUselessImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/uselessImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2877,6 +2845,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestMetadata("idea/testData/quickfix/variables")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Variables.ChangeMutability.class, Variables.ChangeToBackingField.class, Variables.ChangeToFunctionInvocation.class, Variables.ChangeToPropertyName.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Variables extends AbstractQuickFixTest {
         public void testAllFilesPresentInVariables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2896,6 +2865,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/variables/changeMutability")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ChangeMutability extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeMutability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2935,6 +2905,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/variables/changeToBackingField")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ChangeToBackingField extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToBackingField() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2956,6 +2927,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ChangeToFunctionInvocation extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToFunctionInvocation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2971,6 +2943,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("idea/testData/quickfix/variables/changeToPropertyName")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ChangeToPropertyName extends AbstractQuickFixTest {
             @TestMetadata("beforeAbstractProperty.kt")
             public void testAbstractProperty() throws Exception {
@@ -3008,19 +2981,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Variables");
-            suite.addTestSuite(Variables.class);
-            suite.addTestSuite(ChangeMutability.class);
-            suite.addTestSuite(ChangeToBackingField.class);
-            suite.addTestSuite(ChangeToFunctionInvocation.class);
-            suite.addTestSuite(ChangeToPropertyName.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/quickfix/when")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class When extends AbstractQuickFixTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -3052,31 +3017,4 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("QuickFixTestGenerated");
-        suite.addTestSuite(QuickFixTestGenerated.class);
-        suite.addTestSuite(Abstract.class);
-        suite.addTest(AddStarProjections.innerSuite());
-        suite.addTestSuite(AutoImports.class);
-        suite.addTestSuite(ChangeSignature.class);
-        suite.addTestSuite(CheckArguments.class);
-        suite.addTest(CreateFromUsage.innerSuite());
-        suite.addTestSuite(Expressions.class);
-        suite.addTestSuite(Migration.class);
-        suite.addTest(Modifiers.innerSuite());
-        suite.addTest(Nullables.innerSuite());
-        suite.addTest(Override.innerSuite());
-        suite.addTestSuite(PlatformClasses.class);
-        suite.addTestSuite(Supercalls.class);
-        suite.addTestSuite(SupertypeInitialization.class);
-        suite.addTest(Suppress.innerSuite());
-        suite.addTestSuite(TypeAddition.class);
-        suite.addTestSuite(TypeImports.class);
-        suite.addTest(TypeMismatch.innerSuite());
-        suite.addTestSuite(TypeProjection.class);
-        suite.addTestSuite(UselessImports.class);
-        suite.addTest(Variables.innerSuite());
-        suite.addTestSuite(When.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.inline;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/refactoring/inline")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({InlineTestGenerated.AddParenthesis.class, InlineTestGenerated.ExplicateParameterTypes.class, InlineTestGenerated.ExplicateTypeArgument.class, InlineTestGenerated.Property.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class InlineTestGenerated extends AbstractInlineTest {
     public void testAllFilesPresentInInline() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -110,6 +113,7 @@ public class InlineTestGenerated extends AbstractInlineTest {
     
     @TestMetadata("idea/testData/refactoring/inline/addParenthesis")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class AddParenthesis extends AbstractInlineTest {
         public void testAllFilesPresentInAddParenthesis() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -299,6 +303,7 @@ public class InlineTestGenerated extends AbstractInlineTest {
     
     @TestMetadata("idea/testData/refactoring/inline/explicateParameterTypes")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ExplicateParameterTypes extends AbstractInlineTest {
         public void testAllFilesPresentInExplicateParameterTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -350,6 +355,7 @@ public class InlineTestGenerated extends AbstractInlineTest {
     
     @TestMetadata("idea/testData/refactoring/inline/explicateTypeArgument")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ExplicateTypeArgument extends AbstractInlineTest {
         public void testAllFilesPresentInExplicateTypeArgument() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -413,6 +419,7 @@ public class InlineTestGenerated extends AbstractInlineTest {
     
     @TestMetadata("idea/testData/refactoring/inline/property")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Property extends AbstractInlineTest {
         public void testAllFilesPresentInProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -468,13 +475,4 @@ public class InlineTestGenerated extends AbstractInlineTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("InlineTestGenerated");
-        suite.addTestSuite(InlineTestGenerated.class);
-        suite.addTestSuite(AddParenthesis.class);
-        suite.addTestSuite(ExplicateParameterTypes.class);
-        suite.addTestSuite(ExplicateTypeArgument.class);
-        suite.addTestSuite(Property.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetExtractionTestGenerated.IntroduceVariable.class, JetExtractionTestGenerated.ExtractFunction.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
     @TestMetadata("idea/testData/refactoring/introduceVariable")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class IntroduceVariable extends AbstractJetExtractionTest {
         public void testAllFilesPresentInIntroduceVariable() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceVariable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -246,6 +250,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
     @TestMetadata("idea/testData/refactoring/extractFunction")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ExtractFunction.AsProperty.class, ExtractFunction.Basic.class, ExtractFunction.ControlFlow.class, ExtractFunction.DefaultContainer.class, ExtractFunction.Delegation.class, ExtractFunction.Initializers.class, ExtractFunction.Parameters.class, ExtractFunction.TypeParameters.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ExtractFunction extends AbstractJetExtractionTest {
         public void testAllFilesPresentInExtractFunction() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -253,6 +258,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         
         @TestMetadata("idea/testData/refactoring/extractFunction/asProperty")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class AsProperty extends AbstractJetExtractionTest {
             public void testAllFilesPresentInAsProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/asProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -286,6 +292,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         
         @TestMetadata("idea/testData/refactoring/extractFunction/basic")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Basic extends AbstractJetExtractionTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -404,6 +411,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ControlFlow.ConditionalJumps.class, ControlFlow.Default.class, ControlFlow.DefiniteReturns.class, ControlFlow.EvaluateExpression.class, ControlFlow.Initializer.class, ControlFlow.OutputValues.class, ControlFlow.Throws.class, ControlFlow.Unextractable.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ControlFlow extends AbstractJetExtractionTest {
             public void testAllFilesPresentInControlFlow() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -411,6 +419,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class ConditionalJumps extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInConditionalJumps() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -480,6 +489,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/default")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Default extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInDefault() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/default"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -531,6 +541,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class DefiniteReturns extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInDefiniteReturns() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -558,6 +569,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class EvaluateExpression extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInEvaluateExpression() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -645,6 +657,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Initializer extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInInitializer() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/initializer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -696,6 +709,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class OutputValues extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInOutputValues() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/outputValues"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -765,6 +779,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Throws extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInThrows() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/throws"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -810,6 +825,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Unextractable extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInUnextractable() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/unextractable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -871,23 +887,11 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("ControlFlow");
-                suite.addTestSuite(ControlFlow.class);
-                suite.addTestSuite(ConditionalJumps.class);
-                suite.addTestSuite(Default.class);
-                suite.addTestSuite(DefiniteReturns.class);
-                suite.addTestSuite(EvaluateExpression.class);
-                suite.addTestSuite(Initializer.class);
-                suite.addTestSuite(OutputValues.class);
-                suite.addTestSuite(Throws.class);
-                suite.addTestSuite(Unextractable.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/defaultContainer")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class DefaultContainer extends AbstractJetExtractionTest {
             public void testAllFilesPresentInDefaultContainer() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/defaultContainer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -939,6 +943,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         
         @TestMetadata("idea/testData/refactoring/extractFunction/delegation")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Delegation extends AbstractJetExtractionTest {
             public void testAllFilesPresentInDelegation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -967,6 +972,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         @TestMetadata("idea/testData/refactoring/extractFunction/initializers")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Initializers.Accessors.class, Initializers.Classes.class, Initializers.Functions.class, Initializers.Properties.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Initializers extends AbstractJetExtractionTest {
             public void testAllFilesPresentInInitializers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -974,6 +980,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/accessors")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Accessors extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInAccessors() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/accessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1007,6 +1014,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/classes")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Classes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInClasses() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1040,6 +1048,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/functions")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Functions extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInFunctions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1121,6 +1130,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/properties")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Properties extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInProperties() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1176,20 +1186,12 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("Initializers");
-                suite.addTestSuite(Initializers.class);
-                suite.addTestSuite(Accessors.class);
-                suite.addTestSuite(Classes.class);
-                suite.addTestSuite(Functions.class);
-                suite.addTestSuite(Properties.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/parameters")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Parameters.CandidateTypes.class, Parameters.ExtractSuper.class, Parameters.ExtractThis.class, Parameters.It.class, Parameters.Misc.class, Parameters.NonDenotableTypes.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Parameters extends AbstractJetExtractionTest {
             public void testAllFilesPresentInParameters() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1197,6 +1199,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class CandidateTypes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInCandidateTypes() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/candidateTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1242,6 +1245,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class ExtractSuper extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInExtractSuper() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1275,6 +1279,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class ExtractThis extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInExtractThis() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractThis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1326,6 +1331,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/it")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class It extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInIt() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/it"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1359,6 +1365,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/misc")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Misc extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInMisc() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/misc"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1470,6 +1477,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class NonDenotableTypes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInNonDenotableTypes() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1489,21 +1497,11 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("Parameters");
-                suite.addTestSuite(Parameters.class);
-                suite.addTestSuite(CandidateTypes.class);
-                suite.addTestSuite(ExtractSuper.class);
-                suite.addTestSuite(ExtractThis.class);
-                suite.addTestSuite(It.class);
-                suite.addTestSuite(Misc.class);
-                suite.addTestSuite(NonDenotableTypes.class);
-                return suite;
-            }
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/typeParameters")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class TypeParameters extends AbstractJetExtractionTest {
             public void testAllFilesPresentInTypeParameters() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1583,25 +1581,6 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ExtractFunction");
-            suite.addTestSuite(ExtractFunction.class);
-            suite.addTestSuite(AsProperty.class);
-            suite.addTestSuite(Basic.class);
-            suite.addTest(ControlFlow.innerSuite());
-            suite.addTestSuite(DefaultContainer.class);
-            suite.addTestSuite(Delegation.class);
-            suite.addTest(Initializers.innerSuite());
-            suite.addTest(Parameters.innerSuite());
-            suite.addTestSuite(TypeParameters.class);
-            return suite;
-        }
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetExtractionTestGenerated");
-        suite.addTestSuite(IntroduceVariable.class);
-        suite.addTest(ExtractFunction.innerSuite());
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.move;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/refactoring/move")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetMoveTestGenerated extends AbstractJetMoveTest {
     public void testAllFilesPresentInMove() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$"));

idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.rename;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/refactoring/rename")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class RenameTestGenerated extends AbstractRenameTest {
     public void testAllFilesPresentInRename() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$"));

idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.structureView;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/structureView/fileStructure")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class KotlinFileStructureTestGenerated extends AbstractKotlinFileStructureTest {
     public void testAllFilesPresentInFileStructure() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/structureView/fileStructure"), Pattern.compile("^([^\\.]+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("compiler/testData/loadJava/compiledKotlin")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({LazyResolveByStubTestGenerated.Annotations.class, LazyResolveByStubTestGenerated.Class.class, LazyResolveByStubTestGenerated.ClassFun.class, LazyResolveByStubTestGenerated.ClassObject.class, LazyResolveByStubTestGenerated.Constructor.class, LazyResolveByStubTestGenerated.DataClass.class, LazyResolveByStubTestGenerated.Enum.class, LazyResolveByStubTestGenerated.FromLoadJava.class, LazyResolveByStubTestGenerated.Fun.class, LazyResolveByStubTestGenerated.Inline.class, LazyResolveByStubTestGenerated.Prop.class, LazyResolveByStubTestGenerated.Type.class, LazyResolveByStubTestGenerated.Visibility.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTest {
     public void testAllFilesPresentInCompiledKotlin() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -39,6 +42,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Annotations extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -64,6 +68,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ClassMembers extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInClassMembers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -115,6 +120,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Classes extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInClasses() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -208,6 +214,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class PackageMembers extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInPackageMembers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -265,6 +272,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Parameters extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInParameters() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -340,6 +348,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class PropertiesWithoutBackingFields extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -395,21 +404,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Annotations");
-            suite.addTestSuite(Annotations.class);
-            suite.addTestSuite(ClassMembers.class);
-            suite.addTestSuite(Classes.class);
-            suite.addTestSuite(PackageMembers.class);
-            suite.addTestSuite(Parameters.class);
-            suite.addTestSuite(PropertiesWithoutBackingFields.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Class.JavaBean.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Class extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -615,6 +615,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class JavaBean extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInJavaBean() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -658,16 +659,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Class");
-            suite.addTestSuite(Class.class);
-            suite.addTestSuite(JavaBean.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ClassFun extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClassFun() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -713,6 +709,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ClassObject extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClassObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -795,6 +792,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Constructor.Vararg.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Constructor extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -898,6 +896,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Vararg extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInVararg() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -917,16 +916,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Constructor");
-            suite.addTestSuite(Constructor.class);
-            suite.addTestSuite(Vararg.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class DataClass extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInDataClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -978,6 +972,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Enum extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1018,6 +1013,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class FromLoadJava extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInFromLoadJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1230,6 +1226,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class KotlinSignature extends AbstractLazyResolveByStubTest {
             @TestMetadata("AllBoundsInWhen.kt")
             public void testAllBoundsInWhen() throws Exception {
@@ -1333,6 +1330,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error")
             @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Error extends AbstractLazyResolveByStubTest {
                 @TestMetadata("AddingNullability.kt")
                 public void testAddingNullability() throws Exception {
@@ -1505,6 +1503,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
             @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Propagation extends AbstractLazyResolveByStubTest {
                 public void testAllFilesPresentInPropagation() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1518,6 +1517,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter")
                 @TestDataPath("$PROJECT_ROOT")
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class Parameter extends AbstractLazyResolveByStubTest {
                     public void testAllFilesPresentInParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1683,6 +1683,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return")
                 @TestDataPath("$PROJECT_ROOT")
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class Return extends AbstractLazyResolveByStubTest {
                     @TestMetadata("AddNotNullJavaSubtype.kt")
                     public void testAddNotNullJavaSubtype() throws Exception {
@@ -1896,6 +1897,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter")
                 @TestDataPath("$PROJECT_ROOT")
+                @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
                 public static class TypeParameter extends AbstractLazyResolveByStubTest {
                     public void testAllFilesPresentInTypeParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1957,27 +1959,13 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                     
                 }
                 
-                public static Test innerSuite() {
-                    TestSuite suite = new TestSuite("Propagation");
-                    suite.addTestSuite(Propagation.class);
-                    suite.addTestSuite(Parameter.class);
-                    suite.addTestSuite(Return.class);
-                    suite.addTestSuite(TypeParameter.class);
-                    return suite;
-                }
             }
             
-            public static Test innerSuite() {
-                TestSuite suite = new TestSuite("KotlinSignature");
-                suite.addTestSuite(KotlinSignature.class);
-                suite.addTestSuite(Error.class);
-                suite.addTest(Propagation.innerSuite());
-                return suite;
-            }
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Library extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2005,6 +1993,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Modality extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInModality() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2020,6 +2009,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NotNull extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInNotNull() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2057,20 +2047,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("FromLoadJava");
-            suite.addTestSuite(FromLoadJava.class);
-            suite.addTest(KotlinSignature.innerSuite());
-            suite.addTestSuite(Library.class);
-            suite.addTestSuite(Modality.class);
-            suite.addTestSuite(NotNull.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Fun extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInFun() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2138,6 +2120,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class GenericWithTypeVariables extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2207,6 +2190,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class GenericWithoutTypeVariables extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2246,6 +2230,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class NonGeneric extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInNonGeneric() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2351,6 +2336,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Vararg extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInVararg() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2376,19 +2362,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Fun");
-            suite.addTestSuite(Fun.class);
-            suite.addTestSuite(GenericWithTypeVariables.class);
-            suite.addTestSuite(GenericWithoutTypeVariables.class);
-            suite.addTestSuite(NonGeneric.class);
-            suite.addTestSuite(Vararg.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Inline extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2405,6 +2383,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Prop.DefaultAccessors.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Prop extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInProp() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2604,6 +2583,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class DefaultAccessors extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInDefaultAccessors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2671,16 +2651,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Prop");
-            suite.addTestSuite(Prop.class);
-            suite.addTestSuite(DefaultAccessors.class);
-            return suite;
-        }
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/type")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Type extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2864,6 +2839,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Visibility extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInVisibility() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2949,22 +2925,4 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("LazyResolveByStubTestGenerated");
-        suite.addTestSuite(LazyResolveByStubTestGenerated.class);
-        suite.addTest(Annotations.innerSuite());
-        suite.addTest(Class.innerSuite());
-        suite.addTestSuite(ClassFun.class);
-        suite.addTestSuite(ClassObject.class);
-        suite.addTest(Constructor.innerSuite());
-        suite.addTestSuite(DataClass.class);
-        suite.addTestSuite(Enum.class);
-        suite.addTest(FromLoadJava.innerSuite());
-        suite.addTest(Fun.innerSuite());
-        suite.addTestSuite(Inline.class);
-        suite.addTest(Prop.innerSuite());
-        suite.addTestSuite(Type.class);
-        suite.addTestSuite(Visibility.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/multiFileHighlighting")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class MultiFileHighlightingTestGenerated extends AbstractMultiFileHighlightingTest {
     public void testAllFilesPresentInMultiFileHighlighting() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiFileHighlighting"), Pattern.compile("^(.+)\\.kt$"), false);

idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/stubs")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class StubBuilderTestGenerated extends AbstractStubBuilderTest {
     public void testAllFilesPresentInStubs() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/stubs"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.psi;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,10 +31,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetPsiMatcherTestGenerated.Expressions.class, JetPsiMatcherTestGenerated.Types.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
     @TestMetadata("idea/testData/jetPsiMatcher/expressions")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Expressions.ArrayAccess.class, Expressions.BinaryExpr.class, Expressions.Call.class, Expressions.Const.class, Expressions.Misc.class, Expressions.SimpleName.class, Expressions.Super.class, Expressions.Throw.class, Expressions.UnaryExpr.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Expressions extends AbstractJetPsiMatcherTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -40,6 +44,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class ArrayAccess extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInArrayAccess() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -79,6 +84,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class BinaryExpr extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInBinaryExpr() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/binaryExpr"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -154,6 +160,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/call")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Call extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInCall() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/call"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -211,6 +218,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/const")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Const extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInConst() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/const"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -232,6 +240,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/misc")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Misc extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInMisc() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -277,6 +286,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/simpleName")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class SimpleName extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInSimpleName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/simpleName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -304,6 +314,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/super")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Super extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInSuper() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -361,6 +372,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/throw")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class Throw extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInThrow() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/throw"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -382,6 +394,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class UnaryExpr extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInUnaryExpr() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/unaryExpr"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -419,24 +432,11 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("Expressions");
-            suite.addTestSuite(Expressions.class);
-            suite.addTestSuite(ArrayAccess.class);
-            suite.addTestSuite(BinaryExpr.class);
-            suite.addTestSuite(Call.class);
-            suite.addTestSuite(Const.class);
-            suite.addTestSuite(Misc.class);
-            suite.addTestSuite(SimpleName.class);
-            suite.addTestSuite(Super.class);
-            suite.addTestSuite(Throw.class);
-            suite.addTestSuite(UnaryExpr.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/jetPsiMatcher/types")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Types extends AbstractJetPsiMatcherTest {
         public void testAllFilesPresentInTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/types"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -510,10 +510,4 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetPsiMatcherTestGenerated");
-        suite.addTest(Expressions.innerSuite());
-        suite.addTestSuite(Types.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/additionalLazyResolve")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class AdditionalLazyResolveDescriptorRendererTestGenerated extends AbstractAdditionalLazyResolveDescriptorRendererTest {
     public void testAllFilesPresentInAdditionalLazyResolve() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/additionalLazyResolve"), Pattern.compile("^(.+)\\.kt$"), true);

idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceInLib")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ReferenceResolveInLibrarySourcesTestGenerated extends AbstractReferenceResolveInLibrarySourcesTest {
     public void testAllFilesPresentInReferenceInLib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInLib"), Pattern.compile("^(.+)\\.kt$"), false);

idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/resolve/references")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ReferenceResolveTestGenerated.DelegatedPropertyAccessors.class, ReferenceResolveTestGenerated.ForLoopIn.class, ReferenceResolveTestGenerated.Invoke.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
     public void testAllFilesPresentInReferences() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -267,6 +270,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
     @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DelegatedPropertyAccessors.InSource.class, DelegatedPropertyAccessors.InStandardLibrary.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -280,6 +284,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class InSource extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInSource() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -325,6 +330,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class InStandardLibrary extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInStandardLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -344,18 +350,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("DelegatedPropertyAccessors");
-            suite.addTestSuite(DelegatedPropertyAccessors.class);
-            suite.addTestSuite(InSource.class);
-            suite.addTestSuite(InStandardLibrary.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/resolve/references/forLoopIn")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ForLoopIn.InBuiltIns.class, ForLoopIn.InLibrary.class, ForLoopIn.InSource.class})
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class ForLoopIn extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInForLoopIn() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -369,6 +369,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class InBuiltIns extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInBuiltIns() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -390,6 +391,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inLibrary")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class InLibrary extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -405,6 +407,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inSource")
         @TestDataPath("$PROJECT_ROOT")
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class InSource extends AbstractReferenceResolveTest {
             @TestMetadata("allExtensions.kt")
             public void testAllExtensions() throws Exception {
@@ -430,18 +433,11 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ForLoopIn");
-            suite.addTestSuite(ForLoopIn.class);
-            suite.addTestSuite(InBuiltIns.class);
-            suite.addTestSuite(InLibrary.class);
-            suite.addTestSuite(InSource.class);
-            return suite;
-        }
     }
     
     @TestMetadata("idea/testData/resolve/references/invoke")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Invoke extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/invoke"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -503,12 +499,4 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("ReferenceResolveTestGenerated");
-        suite.addTestSuite(ReferenceResolveTestGenerated.class);
-        suite.addTest(DelegatedPropertyAccessors.innerSuite());
-        suite.addTest(ForLoopIn.innerSuite());
-        suite.addTestSuite(Invoke.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceWithLib")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResolveWithLibTest {
     public void testAllFilesPresentInReferenceWithLib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false);

idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -30,6 +32,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ReferenceToJavaWithWrongFileStructureTestGenerated extends AbstractReferenceToJavaWithWrongFileStructureTest {
     public void testAllFilesPresentInReferenceToJavaWithWrongFileStructure() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceToJavaWithWrongFileStructure"), Pattern.compile("^(.+)\\.kt$"), false);

idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.safeDelete;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -29,9 +31,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class, JetSafeDeleteTestGenerated.KotlinValueParameter.class, JetSafeDeleteTestGenerated.KotlinValueParameterWithJava.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinClass extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -107,6 +111,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinObject extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -170,6 +175,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinFunction extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinFunction() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -281,6 +287,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinFunctionWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinFunctionWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -350,6 +357,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class JavaFunctionWithKotlin extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInJavaFunctionWithKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -371,6 +379,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinProperty extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -512,6 +521,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinPropertyWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinPropertyWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -587,6 +597,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class JavaPropertyWithKotlin extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInJavaPropertyWithKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -632,6 +643,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinTypeParameter extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinTypeParameter() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -737,6 +749,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinTypeParameterWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -848,6 +861,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinValueParameter extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinValueParameter() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1043,6 +1057,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     
     @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class KotlinValueParameterWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1212,20 +1227,4 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("JetSafeDeleteTestGenerated");
-        suite.addTestSuite(KotlinClass.class);
-        suite.addTestSuite(KotlinObject.class);
-        suite.addTestSuite(KotlinFunction.class);
-        suite.addTestSuite(KotlinFunctionWithJava.class);
-        suite.addTestSuite(JavaFunctionWithKotlin.class);
-        suite.addTestSuite(KotlinProperty.class);
-        suite.addTestSuite(KotlinPropertyWithJava.class);
-        suite.addTestSuite(JavaPropertyWithKotlin.class);
-        suite.addTestSuite(KotlinTypeParameter.class);
-        suite.addTestSuite(KotlinTypeParameterWithJava.class);
-        suite.addTestSuite(KotlinValueParameter.class);
-        suite.addTestSuite(KotlinValueParameterWithJava.class);
-        return suite;
-    }
 }

idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java

@@ -19,9 +19,11 @@ package org.jetbrains.jet.shortenRefs;
 import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -31,6 +33,7 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/shortenRefs")
 @TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ShortenRefsTestGenerated.Constructor.class, ShortenRefsTestGenerated.Imports.class, ShortenRefsTestGenerated.Java.class, ShortenRefsTestGenerated.Type.class})
+@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
 public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     public void testAllFilesPresentInShortenRefs() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -56,6 +59,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     
     @TestMetadata("idea/testData/shortenRefs/constructor")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Constructor extends AbstractShortenRefsTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/constructor"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -149,6 +153,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     
     @TestMetadata("idea/testData/shortenRefs/imports")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Imports extends AbstractShortenRefsTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -176,6 +181,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     
     @TestMetadata("idea/testData/shortenRefs/java")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Java extends AbstractShortenRefsTest {
         public void testAllFilesPresentInJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/java"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -233,6 +239,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     
     @TestMetadata("idea/testData/shortenRefs/type")
     @TestDataPath("$PROJECT_ROOT")
+    @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Type extends AbstractShortenRefsTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/type"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -342,13 +349,4 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("ShortenRefsTestGenerated");
-        suite.addTestSuite(ShortenRefsTestGenerated.class);
-        suite.addTestSuite(Constructor.class);
-        suite.addTestSuite(Imports.class);
-        suite.addTestSuite(Java.class);
-        suite.addTestSuite(Type.class);
-        return suite;
-    }
 }