Renamed some generated tests to follow conventions.

2013-12-18 20:47:35 +04:00
parent 7c4675a9c0
commit cd8f5fae54
23 changed files with 7158 additions and 152 deletions
@@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
@@ -39,7 +38,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-public abstract class AbstractDiagnosticsTestWithEagerResolve extends AbstractJetDiagnosticsTest {
+public abstract class AbstractJetDiagnostics1Test extends BaseDiagnosticsTest {
    @Override
    protected void analyzeAndCheck(File testDataFile, List<TestFile> testFiles) {
@@ -51,7 +51,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
+public abstract class BaseDiagnosticsTest extends JetLiteFixture {
    public static final String DIAGNOSTICS_DIRECTIVE = "DIAGNOSTICS";
    public static final Pattern DIAGNOSTICS_PATTERN = Pattern.compile("([\\+\\-!])(\\w+)\\s*");
@@ -16,7 +16,6 @@
 package org.jetbrains.jet.checkers;
 import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -26,15 +25,13 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.TailRecursion.class})
-public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve {
+public class JetDiagnosticsTestGenerated extends AbstractJetDiagnostics1Test {
    @TestMetadata("compiler/testData/diagnostics/tests")
    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.Unit.class, Tests.Varargs.class, Tests.When.class})
-    public static class Tests extends AbstractDiagnosticsTestWithEagerResolve {
+    public static class Tests extends AbstractJetDiagnostics1Test {
        @TestMetadata("Abstract.kt")
        public void testAbstract() throws Exception {
            doTest("compiler/testData/diagnostics/tests/Abstract.kt");
@@ -510,7 +507,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/annotations")
-        public static class Annotations extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Annotations extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInAnnotations() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -628,7 +625,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/backingField")
-        public static class BackingField extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class BackingField extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInBackingField() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -741,7 +738,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/callableReference")
-        public static class CallableReference extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class CallableReference extends AbstractJetDiagnostics1Test {
            @TestMetadata("abstractClassConstructors.kt")
            public void testAbstractClassConstructors() throws Exception {
                doTest("compiler/testData/diagnostics/tests/callableReference/abstractClassConstructors.kt");
@@ -985,7 +982,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/cast")
        @InnerTestClasses({Cast.Bare.class, Cast.NeverSucceeds.class})
-        public static class Cast extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Cast extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInCast() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/cast"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1211,7 +1208,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/cast/bare")
-            public static class Bare extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Bare extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInBare() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/cast/bare"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -1314,7 +1311,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds")
-            public static class NeverSucceeds extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class NeverSucceeds extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInNeverSucceeds() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/cast/neverSucceeds"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -1351,7 +1348,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/checkArguments")
-        public static class CheckArguments extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class CheckArguments extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInCheckArguments() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/checkArguments"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1379,7 +1376,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/classObjects")
-        public static class ClassObjects extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class ClassObjects extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInClassObjects() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1428,7 +1425,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis")
        @InnerTestClasses({ControlFlowAnalysis.DefiniteReturn.class})
-        public static class ControlFlowAnalysis extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class ControlFlowAnalysis extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInControlFlowAnalysis() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1609,7 +1606,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn")
-            public static class DefiniteReturn extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class DefiniteReturn extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInDefiniteReturn() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -1640,7 +1637,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/controlStructures")
-        public static class ControlStructures extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class ControlStructures extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInControlStructures() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1723,7 +1720,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/dataClasses")
-        public static class DataClasses extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class DataClasses extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInDataClasses() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1837,7 +1834,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/dataFlow")
        @InnerTestClasses({DataFlow.Local.class})
-        public static class DataFlow extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class DataFlow extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInDataFlow() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/dataFlow"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -1863,7 +1860,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/dataFlow/local")
-            public static class Local extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Local extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInLocal() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/dataFlow/local"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -1939,7 +1936,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal")
-        public static class DataFlowInfoTraversal extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class DataFlowInfoTraversal extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -2188,7 +2185,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks")
        @InnerTestClasses({DeclarationChecks.MultiDeclarations.class})
-        public static class DeclarationChecks extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class DeclarationChecks extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInDeclarationChecks() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/declarationChecks"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -2309,7 +2306,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations")
-            public static class MultiDeclarations extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class MultiDeclarations extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInMultiDeclarations() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -2371,7 +2368,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty")
        @InnerTestClasses({DelegatedProperty.Inference.class})
-        public static class DelegatedProperty extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class DelegatedProperty extends AbstractJetDiagnostics1Test {
            @TestMetadata("absentErrorAboutInitializer.kt")
            public void testAbsentErrorAboutInitializer() throws Exception {
                doTest("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt");
@@ -2537,7 +2534,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference")
-            public static class Inference extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Inference extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInInference() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/delegatedProperty/inference"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -2593,7 +2590,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/deparenthesize")
-        public static class Deparenthesize extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Deparenthesize extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInDeparenthesize() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -2612,7 +2609,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/enum")
        @InnerTestClasses({Enum.Inner.class})
-        public static class Enum extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Enum extends AbstractJetDiagnostics1Test {
            @TestMetadata("AbstractEnum.kt")
            public void testAbstractEnum() throws Exception {
                doTest("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt");
@@ -2728,7 +2725,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/enum/inner")
-            public static class Inner extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Inner extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInInner() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/enum/inner"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -2799,7 +2796,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/evaluate")
-        public static class Evaluate extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Evaluate extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInEvaluate() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/evaluate"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -2887,7 +2884,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/extensions")
-        public static class Extensions extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Extensions extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInExtensions() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -2966,7 +2963,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals")
        @InnerTestClasses({FunctionLiterals.Return.class})
-        public static class FunctionLiterals extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class FunctionLiterals extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInFunctionLiterals() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -3022,7 +3019,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals/return")
-            public static class Return extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Return extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInReturn() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/functionLiterals/return"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3104,7 +3101,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/generics")
        @InnerTestClasses({Generics.TpAsReified.class, Generics.VarProjection.class})
-        public static class Generics extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Generics extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInGenerics() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/generics"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -3165,7 +3162,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified")
-            public static class TpAsReified extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class TpAsReified extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInTpAsReified() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3198,7 +3195,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/generics/varProjection")
-            public static class VarProjection extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class VarProjection extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInVarProjection() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/generics/varProjection"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3236,7 +3233,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode")
        @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class})
-        public static class IncompleteCode extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class IncompleteCode extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInIncompleteCode() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/incompleteCode"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -3302,7 +3299,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError")
-            public static class DiagnosticWithSyntaxError extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class DiagnosticWithSyntaxError extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInDiagnosticWithSyntaxError() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3379,7 +3376,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/inference")
        @InnerTestClasses({Inference.Constraints.class, Inference.NestedCalls.class, Inference.Regressions.class, Inference.ReportingImprovements.class, Inference.UpperBounds.class, Inference.Varargs.class})
-        public static class Inference extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Inference extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInInference() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -3530,7 +3527,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/constraints")
-            public static class Constraints extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Constraints extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInConstraints() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/constraints"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3563,7 +3560,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls")
-            public static class NestedCalls extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class NestedCalls extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInNestedCalls() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3626,7 +3623,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/regressions")
-            public static class Regressions extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Regressions extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInRegressions() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3849,7 +3846,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements")
-            public static class ReportingImprovements extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class ReportingImprovements extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInReportingImprovements() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3882,7 +3879,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/upperBounds")
-            public static class UpperBounds extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class UpperBounds extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInUpperBounds() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/upperBounds"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3920,7 +3917,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inference/varargs")
-            public static class Varargs extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Varargs extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInVarargs() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inference/varargs"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -3946,7 +3943,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/infos")
-        public static class Infos extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Infos extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInInfos() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/infos"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -3965,7 +3962,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/inline")
        @InnerTestClasses({Inline.BinaryExpressions.class, Inline.NonPublicMember.class, Inline.UnaryExpressions.class})
-        public static class Inline extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Inline extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInInline() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inline"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4071,7 +4068,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions")
-            public static class BinaryExpressions extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class BinaryExpressions extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInBinaryExpressions() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inline/binaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -4119,7 +4116,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember")
-            public static class NonPublicMember extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class NonPublicMember extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInNonPublicMember() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inline/nonPublicMember"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -4162,7 +4159,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions")
-            public static class UnaryExpressions extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class UnaryExpressions extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInUnaryExpressions() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inline/unaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -4191,7 +4188,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/inner")
        @InnerTestClasses({Inner.QualifiedExpression.class})
-        public static class Inner extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Inner extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInInner() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inner"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4327,7 +4324,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression")
-            public static class QualifiedExpression extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class QualifiedExpression extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInQualifiedExpression() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -4393,7 +4390,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/j+k")
-        public static class J_k extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class J_k extends AbstractJetDiagnostics1Test {
            @TestMetadata("accessClassObjectFromJava.kt")
            public void testAccessClassObjectFromJava() throws Exception {
                doTest("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt");
@@ -4537,7 +4534,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations")
        @InnerTestClasses({Jdk_annotations.Sql.class})
-        public static class Jdk_annotations extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Jdk_annotations extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInJdk_annotations() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/jdk-annotations"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4558,7 +4555,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql")
-            public static class Sql extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Sql extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInSql() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -4589,7 +4586,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/library")
-        public static class Library extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Library extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInLibrary() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4612,7 +4609,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts")
-        public static class NullabilityAndAutoCasts extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class NullabilityAndAutoCasts extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInNullabilityAndAutoCasts() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4775,7 +4772,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/nullableTypes")
-        public static class NullableTypes extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class NullableTypes extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInNullableTypes() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/nullableTypes"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4818,7 +4815,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/numbers")
-        public static class Numbers extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Numbers extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInNumbers() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/numbers"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4846,7 +4843,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/objects")
-        public static class Objects extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Objects extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInObjects() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/objects"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4884,7 +4881,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading")
-        public static class OperatorsOverloading extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class OperatorsOverloading extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInOperatorsOverloading() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/operatorsOverloading"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4912,7 +4909,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/overload")
-        public static class Overload extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Overload extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInOverload() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -4990,7 +4987,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/override")
-        public static class Override extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Override extends AbstractJetDiagnostics1Test {
            @TestMetadata("AbstractFunImplemented.kt")
            public void testAbstractFunImplemented() throws Exception {
                doTest("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt");
@@ -5188,7 +5185,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/recovery")
-        public static class Recovery extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Recovery extends AbstractJetDiagnostics1Test {
            @TestMetadata("absentLeftHandSide.kt")
            public void testAbsentLeftHandSide() throws Exception {
                doTest("compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt");
@@ -5201,7 +5198,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/redeclarations")
-        public static class Redeclarations extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Redeclarations extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInRedeclarations() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/redeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -5274,7 +5271,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/regressions")
-        public static class Regressions extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Regressions extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInRegressions() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -5778,7 +5775,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/resolve")
        @InnerTestClasses({Resolve.Invoke.class, Resolve.NestedCalls.class, Resolve.SpecialConstructions.class})
-        public static class Resolve extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Resolve extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInResolve() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/resolve"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -5819,7 +5816,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke")
-            public static class Invoke extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Invoke extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInInvoke() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -5862,7 +5859,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls")
-            public static class NestedCalls extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class NestedCalls extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInNestedCalls() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/resolve/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -5885,7 +5882,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions")
-            public static class SpecialConstructions extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class SpecialConstructions extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInSpecialConstructions() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/resolve/specialConstructions"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -5918,7 +5915,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/scopes")
-        public static class Scopes extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Scopes extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInScopes() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/scopes"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6136,7 +6133,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/senselessComparison")
-        public static class SenselessComparison extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class SenselessComparison extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInSenselessComparison() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/senselessComparison"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6149,7 +6146,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/shadowing")
-        public static class Shadowing extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Shadowing extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInShadowing() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/shadowing"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6208,7 +6205,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/smartCasts")
        @InnerTestClasses({SmartCasts.Inference.class})
-        public static class SmartCasts extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class SmartCasts extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInSmartCasts() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6264,7 +6261,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/inference")
-            public static class Inference extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class Inference extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInInference() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/smartCasts/inference"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -6310,7 +6307,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/substitutions")
-        public static class Substitutions extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Substitutions extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInSubstitutions() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/substitutions"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6333,7 +6330,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/subtyping")
-        public static class Subtyping extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Subtyping extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInSubtyping() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6367,13 +6364,13 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        @TestMetadata("compiler/testData/diagnostics/tests/suppress")
        @InnerTestClasses({Suppress.AllWarnings.class, Suppress.ManyWarnings.class, Suppress.OneWarning.class})
-        public static class Suppress extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Suppress extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInSuppress() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/suppress"), Pattern.compile("^(.+)\\.kt$"), true);
            }
            @TestMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings")
-            public static class AllWarnings extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class AllWarnings extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInAllWarnings() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -6421,7 +6418,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings")
-            public static class ManyWarnings extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class ManyWarnings extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInManyWarnings() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/suppress/manyWarnings"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -6474,7 +6471,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            }
            @TestMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning")
-            public static class OneWarning extends AbstractDiagnosticsTestWithEagerResolve {
+            public static class OneWarning extends AbstractJetDiagnostics1Test {
                public void testAllFilesPresentInOneWarning() throws Exception {
                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/suppress/oneWarning"), Pattern.compile("^(.+)\\.kt$"), true);
                }
@@ -6537,7 +6534,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
-        public static class ThisAndSuper extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class ThisAndSuper extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInThisAndSuper() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/thisAndSuper"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6605,7 +6602,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/unit")
-        public static class Unit extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Unit extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInUnit() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/unit"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6618,7 +6615,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/varargs")
-        public static class Varargs extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class Varargs extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInVarargs() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/varargs"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6681,7 +6678,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
        }
        @TestMetadata("compiler/testData/diagnostics/tests/when")
-        public static class When extends AbstractDiagnosticsTestWithEagerResolve {
+        public static class When extends AbstractJetDiagnostics1Test {
            public void testAllFilesPresentInWhen() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/when"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -6790,7 +6787,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
    }
    @TestMetadata("compiler/testData/diagnostics/tests/script")
-    public static class Script extends AbstractDiagnosticsTestWithEagerResolve {
+    public static class Script extends AbstractJetDiagnostics1Test {
        @TestMetadata("AccessForwardDeclarationInScript.ktscript")
        public void testAccessForwardDeclarationInScript() throws Exception {
            doTest("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.ktscript");
@@ -6818,7 +6815,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
    }
    @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion")
-    public static class TailRecursion extends AbstractDiagnosticsTestWithEagerResolve {
+    public static class TailRecursion extends AbstractJetDiagnostics1Test {
        public void testAllFilesPresentInTailRecursion() throws Exception {
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true);
        }
@@ -27,7 +27,7 @@ import java.util.List;
 import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefixes;
-public abstract class AbstractDefaultConstructorCodegenTest extends CodegenTestCase {
+public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTestCase {
    @Override
    public void setUp() throws Exception {
@@ -26,12 +26,12 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCodegenTest;
+import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/defaultArguments/reflection")
-public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultConstructorCodegenTest {
+public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgumentsReflectionTest {
    public void testAllFilesPresentInReflection() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true);
    }
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy;
 import com.google.common.base.Predicate;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
+import org.jetbrains.jet.checkers.BaseDiagnosticsTest;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -33,7 +33,7 @@ import java.util.Set;
 import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE;
 import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptors;
-public abstract class AbstractLazyResolveDiagnosticsTest extends AbstractJetDiagnosticsTest {
+public abstract class AbstractLazyResolveDiagnosticsTest extends BaseDiagnosticsTest {
    public static final File TEST_DATA_DIR = new File("compiler/testData/diagnostics/tests");
@@ -31,8 +31,8 @@ import org.jetbrains.jet.resolve.AbstractResolveTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/resolve")
-@InnerTestClasses({JetResolveTestGenerated.CandidatesPriority.class, JetResolveTestGenerated.DelegatedProperty.class, JetResolveTestGenerated.Imports.class, JetResolveTestGenerated.Labels.class, JetResolveTestGenerated.Regressions.class, JetResolveTestGenerated.Varargs.class})
+@InnerTestClasses({ResolveTestGenerated.CandidatesPriority.class, ResolveTestGenerated.DelegatedProperty.class, ResolveTestGenerated.Imports.class, ResolveTestGenerated.Labels.class, ResolveTestGenerated.Regressions.class, ResolveTestGenerated.Varargs.class})
-public class JetResolveTestGenerated extends AbstractResolveTest {
+public class ResolveTestGenerated extends AbstractResolveTest {
    public void testAllFilesPresentInResolve() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/resolve"), Pattern.compile("^(.+)\\.resolve$"), true);
    }
@@ -426,8 +426,8 @@ public class JetResolveTestGenerated extends AbstractResolveTest {
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("JetResolveTestGenerated");
+        TestSuite suite = new TestSuite("ResolveTestGenerated");
-        suite.addTestSuite(JetResolveTestGenerated.class);
+        suite.addTestSuite(ResolveTestGenerated.class);
        suite.addTestSuite(CandidatesPriority.class);
        suite.addTestSuite(DelegatedProperty.class);
        suite.addTestSuite(Imports.class);
@@ -31,8 +31,8 @@ import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/resolvedCalls")
-@InnerTestClasses({JetResolvedCallsTestGenerated.FunctionTypes.class, JetResolvedCallsTestGenerated.Invoke.class, JetResolvedCallsTestGenerated.RealExamples.class})
+@InnerTestClasses({ResolvedCallsTestGenerated.FunctionTypes.class, ResolvedCallsTestGenerated.Invoke.class, ResolvedCallsTestGenerated.RealExamples.class})
-public class JetResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
+public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
    public void testAllFilesPresentInResolvedCalls() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/resolvedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
    }
@@ -157,8 +157,8 @@ public class JetResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("JetResolvedCallsTestGenerated");
+        TestSuite suite = new TestSuite("ResolvedCallsTestGenerated");
-        suite.addTestSuite(JetResolvedCallsTestGenerated.class);
+        suite.addTestSuite(ResolvedCallsTestGenerated.class);
        suite.addTestSuite(FunctionTypes.class);
        suite.addTestSuite(Invoke.class);
        suite.addTestSuite(RealExamples.class);
@@ -22,7 +22,7 @@ import org.jetbrains.jet.generators.tests.generator.SimpleTestClassModel
 import java.io.File
 import java.util.regex.Pattern
 import junit.framework.TestCase
-import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve
+import org.jetbrains.jet.checkers.AbstractJetDiagnostics1Test
 import org.jetbrains.jet.resolve.AbstractResolveTest
 import org.jetbrains.jet.parsing.AbstractJetParsingTest
 import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest
@@ -30,7 +30,7 @@ import org.jetbrains.jet.codegen.AbstractBytecodeTextTest
 import org.jetbrains.jet.codegen.AbstractTopLevelMembersInvocationTest
 import org.jetbrains.jet.codegen.AbstractCheckLocalVariablesTableTest
 import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest
-import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCodegenTest
+import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest
 import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest
 import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest
 import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest
@@ -51,7 +51,7 @@ import org.jetbrains.jet.completion.AbstractKeywordCompletionTest
 import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest
 import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
 import org.jetbrains.jet.completion.AbstractJvmWithLibBasicCompletionTest
-import org.jetbrains.jet.plugin.navigation.JetAbstractGotoSuperTest
+import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest
 import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest
 import org.jetbrains.jet.plugin.highlighter.AbstractHighlightingTest
 import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest
@@ -63,8 +63,8 @@ import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest
 import org.jetbrains.jet.plugin.codeInsight.unwrap.AbstractUnwrapRemoveTest
 import org.jetbrains.jet.editor.quickDoc.AbstractJetQuickDocProviderTest
 import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest
-import org.jetbrains.jet.resolve.AbstractResolveBaseTest
+import org.jetbrains.jet.resolve.AbstractReferenceResolveTest
-import org.jetbrains.jet.resolve.AbstractResolveWithLibTest
+import org.jetbrains.jet.resolve.AbstractReferenceResolveWithLibTest
 import org.jetbrains.jet.completion.weighers.AbstractCompletionWeigherTest
 import org.jetbrains.jet.findUsages.AbstractJetFindUsagesTest
 import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest
@@ -83,17 +83,17 @@ fun main(args: Array<String>) {
    testGroup("compiler/tests", "compiler/testData") {
-        testClass(javaClass<AbstractDiagnosticsTestWithEagerResolve>(), "JetDiagnosticsTestGenerated") {
+        testClass(javaClass<AbstractJetDiagnostics1Test>()) {
            model("diagnostics/tests")
            model("diagnostics/tests/script", extension = "ktscript")
            model("codegen/box/functions/tailRecursion")
        }
-        testClass(javaClass<AbstractResolveTest>(), "JetResolveTestGenerated") {
+        testClass(javaClass<AbstractResolveTest>()) {
            model("resolve", extension = "resolve")
        }
-        testClass(javaClass<AbstractResolvedCallsTest>(), "JetResolvedCallsTestGenerated") {
+        testClass(javaClass<AbstractResolvedCallsTest>()) {
            model("resolvedCalls")
        }
@@ -135,7 +135,7 @@ fun main(args: Array<String>) {
            model("writeFlags")
        }
-        testClass(javaClass<AbstractDefaultConstructorCodegenTest>(), "DefaultArgumentsReflectionTestGenerated") {
+        testClass(javaClass<AbstractDefaultArgumentsReflectionTest>()) {
            model("codegen/defaultArguments/reflection")
        }
@@ -221,7 +221,7 @@ fun main(args: Array<String>) {
    testGroup("idea/tests", "idea/testData") {
-        testClass(javaClass<AbstractJetPsiMatcherTest>(), "JetPsiMatcherTest") {
+        testClass(javaClass<AbstractJetPsiMatcherTest>()) {
            model("jetPsiMatcher/expressions", testMethod = "doTestExpressions")
            model("jetPsiMatcher/types", testMethod = "doTestTypes")
        }
@@ -241,29 +241,29 @@ fun main(args: Array<String>) {
            model("quickfix", pattern = "^before(\\w+)\\.kt$")
        }
-        testClass(javaClass<AbstractJSBasicCompletionTest>(), "JetBasicJSCompletionTestGenerated") {
+        testClass(javaClass<AbstractJSBasicCompletionTest>()) {
            model("completion/basic/common")
            model("completion/basic/js")
        }
-        testClass(javaClass<AbstractJvmBasicCompletionTest>(), "JetBasicJavaCompletionTestGenerated") {
+        testClass(javaClass<AbstractJvmBasicCompletionTest>()) {
            model("completion/basic/common")
            model("completion/basic/java")
        }
-        testClass(javaClass<AbstractJvmSmartCompletionTest>(), "JetSmartCompletionTestGenerated") {
+        testClass(javaClass<AbstractJvmSmartCompletionTest>()) {
            model("completion/smart")
        }
-        testClass(javaClass<AbstractKeywordCompletionTest>(), "JetKeywordCompletionTestGenerated") {
+        testClass(javaClass<AbstractKeywordCompletionTest>()) {
            model("completion/keywords", recursive = false)
        }
-        testClass(javaClass<AbstractJvmWithLibBasicCompletionTest>(), "JetJavaLibCompletionTestGenerated") {
+        testClass(javaClass<AbstractJvmWithLibBasicCompletionTest>()) {
            model("completion/basic/custom", recursive = false)
        }
-        testClass(javaClass<JetAbstractGotoSuperTest>(), "JetGotoSuperTestGenerated") {
+        testClass(javaClass<AbstractGotoSuperTest>()) {
            model("navigation/gotoSuper", extension = "test")
        }
@@ -293,7 +293,7 @@ fun main(args: Array<String>) {
            model("codeInsight/surroundWith/functionLiteral", testMethod = "doTestWithFunctionLiteralSurrounder")
        }
-        testClass(javaClass<AbstractCodeTransformationTest>(), "CodeTransformationsTestGenerated") {
+        testClass(javaClass<AbstractCodeTransformationTest>()) {
            model("intentions/branched/folding/ifToAssignment", testMethod = "doTestFoldIfToAssignment")
            model("intentions/branched/folding/ifToReturn", testMethod = "doTestFoldIfToReturn")
            model("intentions/branched/folding/ifToReturnAsymmetrically", testMethod = "doTestFoldIfToReturnAsymmetrically")
@@ -369,11 +369,11 @@ fun main(args: Array<String>) {
            model("safeDelete/deleteValueParameter/kotlinValueParameterWithJava", testMethod = "doValueParameterTestWithJava")
        }
-        testClass(javaClass<AbstractResolveBaseTest>(), "ReferenceResolveTestGenerated") {
+        testClass(javaClass<AbstractReferenceResolveTest>()) {
            model("resolve/references")
        }
-        testClass(javaClass<AbstractResolveWithLibTest>(), "ReferenceResolveWithLibTestGenerated") {
+        testClass(javaClass<AbstractReferenceResolveWithLibTest>()) {
            model("resolve/referenceWithLib", recursive = false)
        }
@@ -30,8 +30,8 @@ import org.jetbrains.jet.completion.AbstractJSBasicCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({JetBasicJSCompletionTestGenerated.Common.class, JetBasicJSCompletionTestGenerated.Js.class})
+@InnerTestClasses({JSBasicCompletionTestGenerated.Common.class, JSBasicCompletionTestGenerated.Js.class})
-public class JetBasicJSCompletionTestGenerated extends AbstractJSBasicCompletionTest {
+public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest {
    @TestMetadata("idea/testData/completion/basic/common")
    @InnerTestClasses({Common.Extensions.class})
    public static class Common extends AbstractJSBasicCompletionTest {
@@ -504,7 +504,7 @@ public class JetBasicJSCompletionTestGenerated extends AbstractJSBasicCompletion
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("JetBasicJSCompletionTestGenerated");
+        TestSuite suite = new TestSuite("JSBasicCompletionTestGenerated");
        suite.addTest(Common.innerSuite());
        suite.addTestSuite(Js.class);
        return suite;
@@ -30,8 +30,8 @@ import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({JetBasicJavaCompletionTestGenerated.Common.class, JetBasicJavaCompletionTestGenerated.Java.class})
+@InnerTestClasses({JvmBasicCompletionTestGenerated.Common.class, JvmBasicCompletionTestGenerated.Java.class})
-public class JetBasicJavaCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
+public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
    @TestMetadata("idea/testData/completion/basic/common")
    @InnerTestClasses({Common.Extensions.class})
    public static class Common extends AbstractJvmBasicCompletionTest {
@@ -534,7 +534,7 @@ public class JetBasicJavaCompletionTestGenerated extends AbstractJvmBasicComplet
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("JetBasicJavaCompletionTestGenerated");
+        TestSuite suite = new TestSuite("JvmBasicCompletionTestGenerated");
        suite.addTest(Common.innerSuite());
        suite.addTestSuite(Java.class);
        return suite;
@@ -31,7 +31,7 @@ import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/smart")
-public class JetSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
+public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
    public void testAllFilesPresentInSmart() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/smart"), Pattern.compile("^(.+)\\.kt$"), true);
    }
@@ -31,7 +31,7 @@ import org.jetbrains.jet.completion.AbstractJvmWithLibBasicCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/basic/custom")
-public class JetJavaLibCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
+public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
    public void testAllFilesPresentInCustom() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/basic/custom"), Pattern.compile("^(.+)\\.kt$"), false);
    }
@@ -31,7 +31,7 @@ import org.jetbrains.jet.completion.AbstractKeywordCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/keywords")
-public class JetKeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
+public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
    @TestMetadata("AfterClassProperty.kt")
    public void testAfterClassProperty() throws Exception {
        doTest("idea/testData/completion/keywords/AfterClassProperty.kt");
@@ -30,8 +30,8 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({CodeTransformationsTestGenerated.IfToAssignment.class, CodeTransformationsTestGenerated.IfToReturn.class, CodeTransformationsTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationsTestGenerated.WhenToAssignment.class, CodeTransformationsTestGenerated.WhenToReturn.class, CodeTransformationsTestGenerated.AssignmentToIf.class, CodeTransformationsTestGenerated.AssignmentToWhen.class, CodeTransformationsTestGenerated.PropertyToIf.class, CodeTransformationsTestGenerated.PropertyToWhen.class, CodeTransformationsTestGenerated.ReturnToIf.class, CodeTransformationsTestGenerated.ReturnToWhen.class, CodeTransformationsTestGenerated.IfToWhen.class, CodeTransformationsTestGenerated.WhenToIf.class, CodeTransformationsTestGenerated.Flatten.class, CodeTransformationsTestGenerated.Merge.class, CodeTransformationsTestGenerated.IntroduceSubject.class, CodeTransformationsTestGenerated.EliminateSubject.class, CodeTransformationsTestGenerated.Split.class, CodeTransformationsTestGenerated.Join.class, CodeTransformationsTestGenerated.ConvertMemberToExtension.class, CodeTransformationsTestGenerated.ReconstructedType.class, CodeTransformationsTestGenerated.RemoveUnnecessaryParentheses.class})
+@InnerTestClasses({CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class})
-public class CodeTransformationsTestGenerated extends AbstractCodeTransformationTest {
+public class CodeTransformationTestGenerated extends AbstractCodeTransformationTest {
    @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment")
    public static class IfToAssignment extends AbstractCodeTransformationTest {
        public void testAllFilesPresentInIfToAssignment() throws Exception {
@@ -1179,7 +1179,7 @@ public class CodeTransformationsTestGenerated extends AbstractCodeTransformation
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("CodeTransformationsTestGenerated");
+        TestSuite suite = new TestSuite("CodeTransformationTestGenerated");
        suite.addTestSuite(IfToAssignment.class);
        suite.addTestSuite(IfToReturn.class);
        suite.addTestSuite(IfToReturnAsymmetrically.class);
@@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import java.io.File;
 import java.util.List;
-public abstract class JetAbstractGotoSuperTest extends LightCodeInsightFixtureTestCase {
+public abstract class AbstractGotoSuperTest extends LightCodeInsightFixtureTestCase {
    protected void doTest(String testPath) {
        List<String> parts = JetTestUtils.loadBeforeAfterText(testPath);
@@ -26,12 +26,12 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.plugin.navigation.JetAbstractGotoSuperTest;
+import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/navigation/gotoSuper")
-public class JetGotoSuperTestGenerated extends JetAbstractGotoSuperTest {
+public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
    public void testAllFilesPresentInGotoSuper() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true);
    }
@@ -30,8 +30,8 @@ import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({JetPsiMatcherTest.Expressions.class, JetPsiMatcherTest.Types.class})
+@InnerTestClasses({JetPsiMatcherTestGenerated.Expressions.class, JetPsiMatcherTestGenerated.Types.class})
-public class JetPsiMatcherTest extends AbstractJetPsiMatcherTest {
+public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
    @TestMetadata("idea/testData/jetPsiMatcher/expressions")
    @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})
    public static class Expressions extends AbstractJetPsiMatcherTest {
@@ -441,7 +441,7 @@ public class JetPsiMatcherTest extends AbstractJetPsiMatcherTest {
    }
    public static Test suite() {
-        TestSuite suite = new TestSuite("JetPsiMatcherTest");
+        TestSuite suite = new TestSuite("JetPsiMatcherTestGenerated");
        suite.addTest(Expressions.innerSuite());
        suite.addTestSuite(Types.class);
        return suite;
@@ -34,7 +34,7 @@ import org.jetbrains.jet.testing.ReferenceUtils;
 import java.util.List;
-public abstract class AbstractResolveBaseTest extends LightPlatformCodeInsightFixtureTestCase {
+public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsightFixtureTestCase {
    public static final String MULTIRESOLVE = "MULTIRESOLVE";
    public static final String REF_EMPTY = "REF_EMPTY";
@@ -20,7 +20,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-public abstract class AbstractResolveWithLibTest extends AbstractResolveBaseTest {
+public abstract class AbstractReferenceResolveWithLibTest extends AbstractReferenceResolveTest {
    private static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceWithLib";
    @Override
@@ -26,13 +26,13 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.resolve.AbstractResolveBaseTest;
+import org.jetbrains.jet.resolve.AbstractReferenceResolveTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/resolve/references")
@InnerTestClasses({ReferenceResolveTestGenerated.DelegatedPropertyAccessors.class, ReferenceResolveTestGenerated.ForLoopIn.class, ReferenceResolveTestGenerated.Invoke.class})
-public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
+public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
    public void testAllFilesPresentInReferences() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references"), Pattern.compile("^(.+)\\.kt$"), true);
    }
@@ -174,7 +174,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
    @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors")
    @InnerTestClasses({DelegatedPropertyAccessors.InSource.class, DelegatedPropertyAccessors.InStandardLibrary.class})
-    public static class DelegatedPropertyAccessors extends AbstractResolveBaseTest {
+    public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest {
        public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception {
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/delegatedPropertyAccessors"), Pattern.compile("^(.+)\\.kt$"), true);
        }
@@ -185,7 +185,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
        }
        @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource")
-        public static class InSource extends AbstractResolveBaseTest {
+        public static class InSource extends AbstractReferenceResolveTest {
            public void testAllFilesPresentInInSource() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -223,7 +223,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
        }
        @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary")
-        public static class InStandardLibrary extends AbstractResolveBaseTest {
+        public static class InStandardLibrary extends AbstractReferenceResolveTest {
            public void testAllFilesPresentInInStandardLibrary() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -251,7 +251,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
    @TestMetadata("idea/testData/resolve/references/forLoopIn")
    @InnerTestClasses({ForLoopIn.InBuiltIns.class, ForLoopIn.InLibrary.class, ForLoopIn.InSource.class})
-    public static class ForLoopIn extends AbstractResolveBaseTest {
+    public static class ForLoopIn extends AbstractReferenceResolveTest {
        public void testAllFilesPresentInForLoopIn() throws Exception {
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/forLoopIn"), Pattern.compile("^(.+)\\.kt$"), true);
        }
@@ -262,7 +262,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
        }
        @TestMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns")
-        public static class InBuiltIns extends AbstractResolveBaseTest {
+        public static class InBuiltIns extends AbstractReferenceResolveTest {
            public void testAllFilesPresentInInBuiltIns() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -280,7 +280,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
        }
        @TestMetadata("idea/testData/resolve/references/forLoopIn/inLibrary")
-        public static class InLibrary extends AbstractResolveBaseTest {
+        public static class InLibrary extends AbstractReferenceResolveTest {
            public void testAllFilesPresentInInLibrary() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^(.+)\\.kt$"), true);
            }
@@ -293,7 +293,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
        }
        @TestMetadata("idea/testData/resolve/references/forLoopIn/inSource")
-        public static class InSource extends AbstractResolveBaseTest {
+        public static class InSource extends AbstractReferenceResolveTest {
            @TestMetadata("allExtensions.kt")
            public void testAllExtensions() throws Exception {
                doTest("idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt");
@@ -326,7 +326,7 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest {
    }
    @TestMetadata("idea/testData/resolve/references/invoke")
-    public static class Invoke extends AbstractResolveBaseTest {
+    public static class Invoke extends AbstractReferenceResolveTest {
        public void testAllFilesPresentInInvoke() throws Exception {
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/references/invoke"), Pattern.compile("^(.+)\\.kt$"), true);
        }
@@ -26,12 +26,12 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.resolve.AbstractResolveWithLibTest;
+import org.jetbrains.jet.resolve.AbstractReferenceResolveWithLibTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/resolve/referenceWithLib")
-public class ReferenceResolveWithLibTestGenerated extends AbstractResolveWithLibTest {
+public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResolveWithLibTest {
    public void testAllFilesPresentInReferenceWithLib() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false);
    }