From 62f44f7ed02daece6703f5ff3f157d657975668b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 6 Dec 2013 16:21:21 +0400
Subject: [PATCH] Minor. Reordered test methods.

---
 .../jvm/compiler/AbstractLoadJavaTest.java    |  115 +-
 .../jvm/compiler/LoadJavaTestGenerated.java   | 2060 ++++++++---------
 .../jet/generators/tests/GenerateTests.java   |   15 +-
 3 files changed, 1091 insertions(+), 1099 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
index 26a942036c9..101706b4687 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
@@ -57,18 +57,6 @@ import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.*;
     The generated test compares namespace descriptors loaded from kotlin sources and read from compiled java.
 */
 public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
-
-    protected void doTest(@NotNull String javaFileName) throws Exception {
-        Assert.assertTrue("A java file expected: " + javaFileName, javaFileName.endsWith(".java"));
-        File javaFile = new File(javaFileName);
-        File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt"));
-        File txtFile = getTxtFile(javaFile.getPath());
-        PackageViewDescriptor kotlinPackage = analyzeKotlinAndLoadTestPackage(ktFile, myTestRootDisposable, ConfigurationKind.ALL);
-        Pair<PackageViewDescriptor, BindingContext> javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary(
-                Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL);
-        checkLoadedPackages(txtFile, kotlinPackage, javaPackageAndContext.first, javaPackageAndContext.second);
-    }
-
     protected void doTestCompiledJava(@NotNull String javaFileName) throws Exception {
         doTestCompiledJava(javaFileName, DONT_INCLUDE_METHODS_OF_OBJECT);
     }
@@ -88,56 +76,21 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
         checkJavaPackage(expectedFile, binaryPackageAndContext.first, binaryPackageAndContext.second, DONT_INCLUDE_METHODS_OF_OBJECT);
     }
 
+    protected void doTestCompiledJavaCompareWithKotlin(@NotNull String javaFileName) throws Exception {
+        Assert.assertTrue("A java file expected: " + javaFileName, javaFileName.endsWith(".java"));
+        File javaFile = new File(javaFileName);
+        File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt"));
+        File txtFile = getTxtFile(javaFile.getPath());
+        PackageViewDescriptor kotlinPackage = analyzeKotlinAndLoadTestPackage(ktFile, myTestRootDisposable, ConfigurationKind.ALL);
+        Pair<PackageViewDescriptor, BindingContext> javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary(
+                Arrays.asList(javaFile), tmpdir, myTestRootDisposable, ConfigurationKind.ALL);
+        checkLoadedPackages(txtFile, kotlinPackage, javaPackageAndContext.first, javaPackageAndContext.second);
+    }
+
     protected void doTestCompiledJavaIncludeObjectMethods(@NotNull String javaFileName) throws Exception {
         doTestCompiledJava(javaFileName, RECURSIVE);
     }
 
-    private void doTestCompiledJava(@NotNull String javaFileName, Configuration configuration) throws Exception {
-        final File srcDir = new File(tmpdir, "src");
-        File compiledDir = new File(tmpdir, "compiled");
-        assertTrue(srcDir.mkdir());
-        assertTrue(compiledDir.mkdir());
-
-        List<File> srcFiles = JetTestUtils.createTestFiles(
-                new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName)),
-                new JetTestUtils.TestFileFactory<File>() {
-                    @Override
-                    public File create(String fileName, String text, Map<String, String> directives) {
-                        File targetFile = new File(srcDir, fileName);
-                        try {
-                            FileUtil.writeToFile(targetFile, text);
-                        }
-                        catch (IOException e) {
-                            throw new AssertionError(e);
-                        }
-                        return targetFile;
-                    }
-                });
-
-        JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
-                getTestRootDisposable(), ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.MOCK_JDK);
-
-        Pair<PackageViewDescriptor, BindingContext> javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary(
-                srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.ALL);
-
-        checkJavaPackage(getTxtFile(javaFileName), javaPackageAndContext.first, javaPackageAndContext.second, configuration);
-    }
-
-    protected void doTestSourceJava(@NotNull String javaFileName) throws Exception {
-        File originalJavaFile = new File(javaFileName);
-        File expectedFile = getTxtFile(javaFileName);
-
-        File testPackageDir = new File(tmpdir, "test");
-        assertTrue(testPackageDir.mkdir());
-        FileUtil.copy(originalJavaFile, new File(testPackageDir, originalJavaFile.getName()));
-
-        Pair<PackageViewDescriptor, BindingContext> javaNamespaceAndContext = loadTestPackageAndBindingContextFromJavaRoot(
-                tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY);
-
-        checkJavaPackage(expectedFile, javaNamespaceAndContext.first, javaNamespaceAndContext.second,
-                         DONT_INCLUDE_METHODS_OF_OBJECT.withValidationStrategy(ALLOW_ERROR_TYPES));
-    }
-
     protected void doTestJavaAgainstKotlin(String expectedFileName) throws Exception {
         File expectedFile = new File(expectedFileName);
         File sourcesDir = new File(expectedFileName.replaceFirst("\\.txt$", ""));
@@ -177,6 +130,52 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
         checkJavaPackage(expectedFile, packageView, trace.getBindingContext(), DONT_INCLUDE_METHODS_OF_OBJECT);
     }
 
+    protected void doTestSourceJava(@NotNull String javaFileName) throws Exception {
+        File originalJavaFile = new File(javaFileName);
+        File expectedFile = getTxtFile(javaFileName);
+
+        File testPackageDir = new File(tmpdir, "test");
+        assertTrue(testPackageDir.mkdir());
+        FileUtil.copy(originalJavaFile, new File(testPackageDir, originalJavaFile.getName()));
+
+        Pair<PackageViewDescriptor, BindingContext> javaNamespaceAndContext = loadTestPackageAndBindingContextFromJavaRoot(
+                tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY);
+
+        checkJavaPackage(expectedFile, javaNamespaceAndContext.first, javaNamespaceAndContext.second,
+                         DONT_INCLUDE_METHODS_OF_OBJECT.withValidationStrategy(ALLOW_ERROR_TYPES));
+    }
+
+    private void doTestCompiledJava(@NotNull String javaFileName, Configuration configuration) throws Exception {
+        final File srcDir = new File(tmpdir, "src");
+        File compiledDir = new File(tmpdir, "compiled");
+        assertTrue(srcDir.mkdir());
+        assertTrue(compiledDir.mkdir());
+
+        List<File> srcFiles = JetTestUtils.createTestFiles(
+                new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName)),
+                new JetTestUtils.TestFileFactory<File>() {
+                    @Override
+                    public File create(String fileName, String text, Map<String, String> directives) {
+                        File targetFile = new File(srcDir, fileName);
+                        try {
+                            FileUtil.writeToFile(targetFile, text);
+                        }
+                        catch (IOException e) {
+                            throw new AssertionError(e);
+                        }
+                        return targetFile;
+                    }
+                });
+
+        JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
+                getTestRootDisposable(), ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.MOCK_JDK);
+
+        Pair<PackageViewDescriptor, BindingContext> javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary(
+                srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.ALL);
+
+        checkJavaPackage(getTxtFile(javaFileName), javaPackageAndContext.first, javaPackageAndContext.second, configuration);
+    }
+
     private static void checkForLoadErrorsAndCompare(
             @NotNull PackageViewDescriptor javaPackage,
             @NotNull BindingContext bindingContext,
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index ab41801b22c..67c5a7192d8 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -30,1003 +30,8 @@ import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({LoadJavaTestGenerated.CompiledJavaCompareWithKotlin.class, LoadJavaTestGenerated.CompiledJavaIncludeObjectMethods.class, LoadJavaTestGenerated.CompiledJava.class, LoadJavaTestGenerated.SourceJava.class, LoadJavaTestGenerated.JavaAgainstKotlin.class, LoadJavaTestGenerated.CompiledJavaAndKotlin.class})
+@InnerTestClasses({LoadJavaTestGenerated.CompiledJava.class, LoadJavaTestGenerated.CompiledJavaAndKotlin.class, LoadJavaTestGenerated.CompiledJavaCompareWithKotlin.class, LoadJavaTestGenerated.CompiledJavaIncludeObjectMethods.class, LoadJavaTestGenerated.JavaAgainstKotlin.class, LoadJavaTestGenerated.SourceJava.class})
 public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
-    @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin")
-    @InnerTestClasses({CompiledJavaCompareWithKotlin.Annotation.class, CompiledJavaCompareWithKotlin.Constructor.class, CompiledJavaCompareWithKotlin.JavaBean.class, CompiledJavaCompareWithKotlin.KotlinSignature.class, CompiledJavaCompareWithKotlin.Library.class, CompiledJavaCompareWithKotlin.Modality.class, CompiledJavaCompareWithKotlin.Mutability.class, CompiledJavaCompareWithKotlin.NotNull.class, CompiledJavaCompareWithKotlin.Vararg.class})
-    public static class CompiledJavaCompareWithKotlin extends AbstractLoadJavaTest {
-        public void testAllFilesPresentInCompiledJavaCompareWithKotlin() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin"), Pattern.compile("^(.+)\\.java$"), true);
-        }
-        
-        @TestMetadata("ArrayTypeVariance.java")
-        public void testArrayTypeVariance() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.java");
-        }
-        
-        @TestMetadata("ClassDoesNotOverrideMethod.java")
-        public void testClassDoesNotOverrideMethod() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.java");
-        }
-        
-        @TestMetadata("ClassWithTypeP.java")
-        public void testClassWithTypeP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.java");
-        }
-        
-        @TestMetadata("ClassWithTypePExtendsIterableP.java")
-        public void testClassWithTypePExtendsIterableP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.java");
-        }
-        
-        @TestMetadata("ClassWithTypePP.java")
-        public void testClassWithTypePP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.java");
-        }
-        
-        @TestMetadata("ClassWithTypePRefNext.java")
-        public void testClassWithTypePRefNext() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.java");
-        }
-        
-        @TestMetadata("ClassWithTypePRefSelf.java")
-        public void testClassWithTypePRefSelf() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.java");
-        }
-        
-        @TestMetadata("ClassWithTypePRefSelfAndClass.java")
-        public void testClassWithTypePRefSelfAndClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.java");
-        }
-        
-        @TestMetadata("FieldAsVar.java")
-        public void testFieldAsVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.java");
-        }
-        
-        @TestMetadata("FieldOfArrayType.java")
-        public void testFieldOfArrayType() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.java");
-        }
-        
-        @TestMetadata("FinalFieldAsVal.java")
-        public void testFinalFieldAsVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.java");
-        }
-        
-        @TestMetadata("InheritMethodsDifferentReturnTypes.java")
-        public void testInheritMethodsDifferentReturnTypes() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.java");
-        }
-        
-        @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.java")
-        public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.java");
-        }
-        
-        @TestMetadata("InnerClass.java")
-        public void testInnerClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.java");
-        }
-        
-        @TestMetadata("InnerClassReferencesOuterTP.java")
-        public void testInnerClassReferencesOuterTP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.java");
-        }
-        
-        @TestMetadata("InnerClassesInGeneric.java")
-        public void testInnerClassesInGeneric() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.java");
-        }
-        
-        @TestMetadata("MethodReferencesOuterClassTP.java")
-        public void testMethodReferencesOuterClassTP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.java");
-        }
-        
-        @TestMetadata("MethodTypePOneUpperBound.java")
-        public void testMethodTypePOneUpperBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.java");
-        }
-        
-        @TestMetadata("MethodTypePTwoUpperBounds.java")
-        public void testMethodTypePTwoUpperBounds() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.java");
-        }
-        
-        @TestMetadata("MethodWithTypeP.java")
-        public void testMethodWithTypeP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.java");
-        }
-        
-        @TestMetadata("MethodWithTypePP.java")
-        public void testMethodWithTypePP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.java");
-        }
-        
-        @TestMetadata("MethodWithTypePRefClassP.java")
-        public void testMethodWithTypePRefClassP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.java");
-        }
-        
-        @TestMetadata("MethosWithPRefTP.java")
-        public void testMethosWithPRefTP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.java");
-        }
-        
-        @TestMetadata("MyException.java")
-        public void testMyException() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.java");
-        }
-        
-        @TestMetadata("NestedClass.java")
-        public void testNestedClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.java");
-        }
-        
-        @TestMetadata("RemoveRedundantProjectionKind.java")
-        public void testRemoveRedundantProjectionKind() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.java");
-        }
-        
-        @TestMetadata("Simple.java")
-        public void testSimple() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.java");
-        }
-        
-        @TestMetadata("TwoFields.java")
-        public void testTwoFields() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.java");
-        }
-        
-        @TestMetadata("UnboundWildcard.java")
-        public void testUnboundWildcard() throws Exception {
-            doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.java");
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation")
-        public static class Annotation extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInAnnotation() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("AnnotatedAnnotation.java")
-            public void testAnnotatedAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.java");
-            }
-            
-            @TestMetadata("AnnotatedMethod.java")
-            public void testAnnotatedMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.java");
-            }
-            
-            @TestMetadata("SimpleAnnotation.java")
-            public void testSimpleAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor")
-        public static class Constructor extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInConstructor() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("ConstructorGenericDeep.java")
-            public void testConstructorGenericDeep() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.java");
-            }
-            
-            @TestMetadata("ConstructorGenericSimple.java")
-            public void testConstructorGenericSimple() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.java");
-            }
-            
-            @TestMetadata("ConstructorGenericUpperBound.java")
-            public void testConstructorGenericUpperBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean")
-        public static class JavaBean extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInJavaBean() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("DifferentGetterAndSetter.java")
-            public void testDifferentGetterAndSetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.java");
-            }
-            
-            @TestMetadata("JavaBeanAbstractGetter.java")
-            public void testJavaBeanAbstractGetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.java");
-            }
-            
-            @TestMetadata("JavaBeanVal.java")
-            public void testJavaBeanVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.java");
-            }
-            
-            @TestMetadata("JavaBeanVar.java")
-            public void testJavaBeanVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.java");
-            }
-            
-            @TestMetadata("JavaBeanVarOfGenericType.java")
-            public void testJavaBeanVarOfGenericType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.java");
-            }
-            
-            @TestMetadata("TwoSetters.java")
-            public void testTwoSetters() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature")
-        @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
-        public static class KotlinSignature extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInKotlinSignature() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("ArrayType.java")
-            public void testArrayType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.java");
-            }
-            
-            @TestMetadata("ConstructorWithNewTypeParams.java")
-            public void testConstructorWithNewTypeParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java");
-            }
-            
-            @TestMetadata("ConstructorWithParentTypeParams.java")
-            public void testConstructorWithParentTypeParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java");
-            }
-            
-            @TestMetadata("ConstructorWithSeveralParams.java")
-            public void testConstructorWithSeveralParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java");
-            }
-            
-            @TestMetadata("ConstructorWithoutParams.java")
-            public void testConstructorWithoutParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java");
-            }
-            
-            @TestMetadata("CustomProjectionKind.java")
-            public void testCustomProjectionKind() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.java");
-            }
-            
-            @TestMetadata("MethodWithFunctionTypes.java")
-            public void testMethodWithFunctionTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java");
-            }
-            
-            @TestMetadata("MethodWithGenerics.java")
-            public void testMethodWithGenerics() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.java");
-            }
-            
-            @TestMetadata("MethodWithMappedClasses.java")
-            public void testMethodWithMappedClasses() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.java");
-            }
-            
-            @TestMetadata("MethodWithTypeParameters.java")
-            public void testMethodWithTypeParameters() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.java");
-            }
-            
-            @TestMetadata("MethodWithVararg.java")
-            public void testMethodWithVararg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.java");
-            }
-            
-            @TestMetadata("PropertyArrayTypes.java")
-            public void testPropertyArrayTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.java");
-            }
-            
-            @TestMetadata("PropertyComplexTypes.java")
-            public void testPropertyComplexTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.java");
-            }
-            
-            @TestMetadata("PropertySimpleType.java")
-            public void testPropertySimpleType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.java");
-            }
-            
-            @TestMetadata("StarProjection.java")
-            public void testStarProjection() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.java");
-            }
-            
-            @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error")
-            public static class Error extends AbstractLoadJavaTest {
-                @TestMetadata("AddingNullability.java")
-                public void testAddingNullability() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java");
-                }
-                
-                public void testAllFilesPresentInError() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true);
-                }
-                
-                @TestMetadata("ConflictingProjectionKind.java")
-                public void testConflictingProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java");
-                }
-                
-                @TestMetadata("ExplicitFieldGettersAndSetters.java")
-                public void testExplicitFieldGettersAndSetters() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.java");
-                }
-                
-                @TestMetadata("ExtraUpperBound.java")
-                public void testExtraUpperBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.java");
-                }
-                
-                @TestMetadata("MissingUpperBound.java")
-                public void testMissingUpperBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.java");
-                }
-                
-                @TestMetadata("NoFieldTypeRef.java")
-                public void testNoFieldTypeRef() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.java");
-                }
-                
-                @TestMetadata("NotVarargReplacedWithVararg.java")
-                public void testNotVarargReplacedWithVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.java");
-                }
-                
-                @TestMetadata("RedundantProjectionKind.java")
-                public void testRedundantProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.java");
-                }
-                
-                @TestMetadata("ReturnTypeMissing.java")
-                public void testReturnTypeMissing() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java");
-                }
-                
-                @TestMetadata("SyntaxError.java")
-                public void testSyntaxError() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.java");
-                }
-                
-                @TestMetadata("SyntaxErrorInFieldAnnotation.java")
-                public void testSyntaxErrorInFieldAnnotation() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java");
-                }
-                
-                @TestMetadata("VarargReplacedWithNotVararg.java")
-                public void testVarargReplacedWithNotVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.java");
-                }
-                
-                @TestMetadata("WrongFieldInitializer.java")
-                public void testWrongFieldInitializer() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.java");
-                }
-                
-                @TestMetadata("WrongFieldMutability.java")
-                public void testWrongFieldMutability() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.java");
-                }
-                
-                @TestMetadata("WrongFieldName.java")
-                public void testWrongFieldName() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.java");
-                }
-                
-                @TestMetadata("WrongMethodName.java")
-                public void testWrongMethodName() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.java");
-                }
-                
-                @TestMetadata("WrongProjectionKind.java")
-                public void testWrongProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.java");
-                }
-                
-                @TestMetadata("WrongReturnTypeStructure.java")
-                public void testWrongReturnTypeStructure() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java");
-                }
-                
-                @TestMetadata("WrongTypeName1.java")
-                public void testWrongTypeName1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java");
-                }
-                
-                @TestMetadata("WrongTypeName2.java")
-                public void testWrongTypeName2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java");
-                }
-                
-                @TestMetadata("WrongTypeName3.java")
-                public void testWrongTypeName3() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java");
-                }
-                
-                @TestMetadata("WrongTypeParameterBoundStructure1.java")
-                public void testWrongTypeParameterBoundStructure1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
-                }
-                
-                @TestMetadata("WrongTypeParameterBoundStructure2.java")
-                public void testWrongTypeParameterBoundStructure2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
-                }
-                
-                @TestMetadata("WrongTypeParametersCount.java")
-                public void testWrongTypeParametersCount() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.java");
-                }
-                
-                @TestMetadata("WrongValueParameterStructure1.java")
-                public void testWrongValueParameterStructure1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java");
-                }
-                
-                @TestMetadata("WrongValueParameterStructure2.java")
-                public void testWrongValueParameterStructure2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java");
-                }
-                
-                @TestMetadata("WrongValueParametersCount.java")
-                public void testWrongValueParametersCount() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.java");
-                }
-                
-            }
-            
-            @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation")
-            @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
-            public static class Propagation extends AbstractLoadJavaTest {
-                public void testAllFilesPresentInPropagation() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true);
-                }
-                
-                @TestMetadata("PropagateTypeArgumentNullable.java")
-                public void testPropagateTypeArgumentNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.java");
-                }
-                
-                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter")
-                public static class Parameter extends AbstractLoadJavaTest {
-                    public void testAllFilesPresentInParameter() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true);
-                    }
-                    
-                    @TestMetadata("ChangeProjectionKind1.java")
-                    public void testChangeProjectionKind1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java");
-                    }
-                    
-                    @TestMetadata("ChangeProjectionKind2.java")
-                    public void testChangeProjectionKind2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java");
-                    }
-                    
-                    @TestMetadata("DeeplySubstitutedClassParameter.java")
-                    public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java");
-                    }
-                    
-                    @TestMetadata("DeeplySubstitutedClassParameter2.java")
-                    public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java");
-                    }
-                    
-                    @TestMetadata("InheritMutability.java")
-                    public void testInheritMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.java");
-                    }
-                    
-                    @TestMetadata("InheritNotVararg.java")
-                    public void testInheritNotVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.java");
-                    }
-                    
-                    @TestMetadata("InheritNotVarargInteger.java")
-                    public void testInheritNotVarargInteger() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java");
-                    }
-                    
-                    @TestMetadata("InheritNotVarargNotNull.java")
-                    public void testInheritNotVarargNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java");
-                    }
-                    
-                    @TestMetadata("InheritNotVarargPrimitive.java")
-                    public void testInheritNotVarargPrimitive() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java");
-                    }
-                    
-                    @TestMetadata("InheritNullability.java")
-                    public void testInheritNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java");
-                    }
-                    
-                    @TestMetadata("InheritProjectionKind.java")
-                    public void testInheritProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.java");
-                    }
-                    
-                    @TestMetadata("InheritReadOnliness.java")
-                    public void testInheritReadOnliness() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.java");
-                    }
-                    
-                    @TestMetadata("InheritVararg.java")
-                    public void testInheritVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.java");
-                    }
-                    
-                    @TestMetadata("InheritVarargInteger.java")
-                    public void testInheritVarargInteger() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.java");
-                    }
-                    
-                    @TestMetadata("InheritVarargNotNull.java")
-                    public void testInheritVarargNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.java");
-                    }
-                    
-                    @TestMetadata("InheritVarargPrimitive.java")
-                    public void testInheritVarargPrimitive() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java");
-                    }
-                    
-                    @TestMetadata("Kt3302.java")
-                    public void testKt3302() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.java");
-                    }
-                    
-                    @TestMetadata("MutableToReadOnly.java")
-                    public void testMutableToReadOnly() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java");
-                    }
-                    
-                    @TestMetadata("NotNullToNullable.java")
-                    public void testNotNullToNullable() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java");
-                    }
-                    
-                    @TestMetadata("NullableToNotNull.java")
-                    public void testNullableToNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java");
-                    }
-                    
-                    @TestMetadata("NullableToNotNullKotlinSignature.java")
-                    public void testNullableToNotNullKotlinSignature() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java");
-                    }
-                    
-                    @TestMetadata("OverrideWithErasedParameter.java")
-                    public void testOverrideWithErasedParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java");
-                    }
-                    
-                    @TestMetadata("ReadOnlyToMutable.java")
-                    public void testReadOnlyToMutable() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java");
-                    }
-                    
-                    @TestMetadata("SubclassFromGenericAndNot.java")
-                    public void testSubclassFromGenericAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java");
-                    }
-                    
-                    @TestMetadata("SubstitutedClassParameter.java")
-                    public void testSubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java");
-                    }
-                    
-                    @TestMetadata("SubstitutedClassParameters.java")
-                    public void testSubstitutedClassParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java");
-                    }
-                    
-                }
-                
-                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return")
-                public static class Return extends AbstractLoadJavaTest {
-                    @TestMetadata("AddNotNullJavaSubtype.java")
-                    public void testAddNotNullJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java");
-                    }
-                    
-                    @TestMetadata("AddNotNullSameJavaType.java")
-                    public void testAddNotNullSameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java");
-                    }
-                    
-                    @TestMetadata("AddNullabilityJavaSubtype.java")
-                    public void testAddNullabilityJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java");
-                    }
-                    
-                    @TestMetadata("AddNullabilitySameGenericType1.java")
-                    public void testAddNullabilitySameGenericType1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java");
-                    }
-                    
-                    @TestMetadata("AddNullabilitySameGenericType2.java")
-                    public void testAddNullabilitySameGenericType2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java");
-                    }
-                    
-                    @TestMetadata("AddNullabilitySameJavaType.java")
-                    public void testAddNullabilitySameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java");
-                    }
-                    
-                    public void testAllFilesPresentInReturn() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true);
-                    }
-                    
-                    @TestMetadata("CantMakeImmutableInSubclass.java")
-                    public void testCantMakeImmutableInSubclass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java");
-                    }
-                    
-                    @TestMetadata("DeeplySubstitutedClassParameter.java")
-                    public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java");
-                    }
-                    
-                    @TestMetadata("DeeplySubstitutedClassParameter2.java")
-                    public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java");
-                    }
-                    
-                    @TestMetadata("HalfSubstitutedTypeParameters.java")
-                    public void testHalfSubstitutedTypeParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java");
-                    }
-                    
-                    @TestMetadata("InheritNullabilityGenericSubclassSimple.java")
-                    public void testInheritNullabilityGenericSubclassSimple() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java");
-                    }
-                    
-                    @TestMetadata("InheritNullabilityJavaSubtype.java")
-                    public void testInheritNullabilityJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java");
-                    }
-                    
-                    @TestMetadata("InheritNullabilitySameGenericType.java")
-                    public void testInheritNullabilitySameGenericType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java");
-                    }
-                    
-                    @TestMetadata("InheritNullabilitySameJavaType.java")
-                    public void testInheritNullabilitySameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
-                    }
-                    
-                    @TestMetadata("InheritProjectionKind.java")
-                    public void testInheritProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.java");
-                    }
-                    
-                    @TestMetadata("InheritReadOnlinessOfArgument.java")
-                    public void testInheritReadOnlinessOfArgument() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
-                    }
-                    
-                    @TestMetadata("InheritReadOnlinessSameClass.java")
-                    public void testInheritReadOnlinessSameClass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java");
-                    }
-                    
-                    @TestMetadata("InheritReadOnlinessSubclass.java")
-                    public void testInheritReadOnlinessSubclass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
-                    }
-                    
-                    @TestMetadata("SameProjectionKind.java")
-                    public void testSameProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.java");
-                    }
-                    
-                    @TestMetadata("SubclassFromGenericAndNot.java")
-                    public void testSubclassFromGenericAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java");
-                    }
-                    
-                    @TestMetadata("SubclassOfCollection.java")
-                    public void testSubclassOfCollection() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.java");
-                    }
-                    
-                    @TestMetadata("SubclassOfMapEntry.java")
-                    public void testSubclassOfMapEntry() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.java");
-                    }
-                    
-                    @TestMetadata("SubstitutedClassParameter.java")
-                    public void testSubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java");
-                    }
-                    
-                    @TestMetadata("SubstitutedClassParameters.java")
-                    public void testSubstitutedClassParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesConflictingProjectionKinds.java")
-                    public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.java")
-                    public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.java")
-                    public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesMutableAndNot.java")
-                    public void testTwoSuperclassesMutableAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesReturnJavaSubtype.java")
-                    public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesReturnSameJavaType.java")
-                    public void testTwoSuperclassesReturnSameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclassesSupplementNotNull.java")
-                    public void testTwoSuperclassesSupplementNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java");
-                    }
-                    
-                    @TestMetadata("TypeParamOfClass.java")
-                    public void testTypeParamOfClass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.java");
-                    }
-                    
-                    @TestMetadata("TypeParamOfClassSubstituted.java")
-                    public void testTypeParamOfClassSubstituted() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java");
-                    }
-                    
-                    @TestMetadata("TypeParamOfFun.java")
-                    public void testTypeParamOfFun() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.java");
-                    }
-                    
-                }
-                
-                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter")
-                public static class TypeParameter extends AbstractLoadJavaTest {
-                    public void testAllFilesPresentInTypeParameter() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true);
-                    }
-                    
-                    @TestMetadata("InheritMutability.java")
-                    public void testInheritMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.java");
-                    }
-                    
-                    @TestMetadata("InheritNullability.java")
-                    public void testInheritNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.java");
-                    }
-                    
-                    @TestMetadata("InheritReadOnliness.java")
-                    public void testInheritReadOnliness() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java");
-                    }
-                    
-                    @TestMetadata("TwoBounds.java")
-                    public void testTwoBounds() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.java");
-                    }
-                    
-                    @TestMetadata("TwoSuperclasses.java")
-                    public void testTwoSuperclasses() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java");
-                    }
-                    
-                    @TestMetadata("TwoTypeParameters.java")
-                    public void testTwoTypeParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java");
-                    }
-                    
-                    @TestMetadata("UseParameterAsUpperBound.java")
-                    public void testUseParameterAsUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java");
-                    }
-                    
-                    @TestMetadata("UseParameterInUpperBound.java")
-                    public void testUseParameterInUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java");
-                    }
-                    
-                    @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.java")
-                    public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java");
-                    }
-                    
-                }
-                
-                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/compiledJavaCompareWithKotlin/library")
-        public static class Library extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInLibrary() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("LoadIterable.java")
-            public void testLoadIterable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.java");
-            }
-            
-            @TestMetadata("LoadIterator.java")
-            public void testLoadIterator() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality")
-        public static class Modality extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInModality() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("ModalityOfFakeOverrides.java")
-            public void testModalityOfFakeOverrides() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability")
-        public static class Mutability extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInMutability() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("LoadIterable.java")
-            public void testLoadIterable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.java");
-            }
-            
-            @TestMetadata("LoadIterableWithConflict.java")
-            public void testLoadIterableWithConflict() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.java");
-            }
-            
-            @TestMetadata("LoadIterableWithNullability.java")
-            public void testLoadIterableWithNullability() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.java");
-            }
-            
-            @TestMetadata("LoadIterableWithPropagation.java")
-            public void testLoadIterableWithPropagation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull")
-        public static class NotNull extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInNotNull() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("NotNullField.java")
-            public void testNotNullField() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.java");
-            }
-            
-            @TestMetadata("NotNullMethod.java")
-            public void testNotNullMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.java");
-            }
-            
-            @TestMetadata("NotNullParameter.java")
-            public void testNotNullParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.java");
-            }
-            
-        }
-        
-        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg")
-        public static class Vararg extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInVararg() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg"), Pattern.compile("^(.+)\\.java$"), true);
-            }
-            
-            @TestMetadata("VarargInt.java")
-            public void testVarargInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.java");
-            }
-            
-            @TestMetadata("VarargString.java")
-            public void testVarargString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.java");
-            }
-            
-        }
-        
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("CompiledJavaCompareWithKotlin");
-            suite.addTestSuite(CompiledJavaCompareWithKotlin.class);
-            suite.addTestSuite(Annotation.class);
-            suite.addTestSuite(Constructor.class);
-            suite.addTestSuite(JavaBean.class);
-            suite.addTest(KotlinSignature.innerSuite());
-            suite.addTestSuite(Library.class);
-            suite.addTestSuite(Modality.class);
-            suite.addTestSuite(Mutability.class);
-            suite.addTestSuite(NotNull.class);
-            suite.addTestSuite(Vararg.class);
-            return suite;
-        }
-    }
-    
-    @TestMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods")
-    public static class CompiledJavaIncludeObjectMethods extends AbstractLoadJavaTest {
-        public void testAllFilesPresentInCompiledJavaIncludeObjectMethods() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true);
-        }
-        
-        @TestMetadata("ClassWithObjectMethod.java")
-        public void testClassWithObjectMethod() throws Exception {
-            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java");
-        }
-        
-        @TestMetadata("InterfaceWithObjectMethods.java")
-        public void testInterfaceWithObjectMethods() throws Exception {
-            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java");
-        }
-        
-    }
-    
     @TestMetadata("compiler/testData/loadJava/compiledJava")
     @InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.Sam.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class})
     public static class CompiledJava extends AbstractLoadJavaTest {
@@ -1485,35 +490,1016 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
     }
     
-    @TestMetadata("compiler/testData/loadJava/sourceJava")
-    public static class SourceJava extends AbstractLoadJavaTest {
-        public void testAllFilesPresentInSourceJava() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true);
+    @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin")
+    @InnerTestClasses({})
+    public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest {
+        public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaAndKotlin"), Pattern.compile("^(.+)\\.txt$"), true);
         }
         
-        @TestMetadata("ClassExtendsTypeParameter.java")
-        public void testClassExtendsTypeParameter() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java");
+        @TestMetadata("MixedPackage.txt")
+        public void testMixedPackage() throws Exception {
+            doTestCompiledJavaAndKotlin("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt");
         }
         
-        @TestMetadata("ErrorTypes.java")
-        public void testErrorTypes() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ErrorTypes.java");
+        public static Test innerSuite() {
+            TestSuite suite = new TestSuite("CompiledJavaAndKotlin");
+            suite.addTestSuite(CompiledJavaAndKotlin.class);
+            return suite;
+        }
+    }
+    
+    @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin")
+    @InnerTestClasses({CompiledJavaCompareWithKotlin.Annotation.class, CompiledJavaCompareWithKotlin.Constructor.class, CompiledJavaCompareWithKotlin.JavaBean.class, CompiledJavaCompareWithKotlin.KotlinSignature.class, CompiledJavaCompareWithKotlin.Library.class, CompiledJavaCompareWithKotlin.Modality.class, CompiledJavaCompareWithKotlin.Mutability.class, CompiledJavaCompareWithKotlin.NotNull.class, CompiledJavaCompareWithKotlin.Vararg.class})
+    public static class CompiledJavaCompareWithKotlin extends AbstractLoadJavaTest {
+        public void testAllFilesPresentInCompiledJavaCompareWithKotlin() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin"), Pattern.compile("^(.+)\\.java$"), true);
         }
         
-        @TestMetadata("ReturnInnerSubclassOfSupersInner.java")
-        public void testReturnInnerSubclassOfSupersInner() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java");
+        @TestMetadata("ArrayTypeVariance.java")
+        public void testArrayTypeVariance() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.java");
         }
         
-        @TestMetadata("ReturnNotSubtype.java")
-        public void testReturnNotSubtype() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java");
+        @TestMetadata("ClassDoesNotOverrideMethod.java")
+        public void testClassDoesNotOverrideMethod() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.java");
         }
         
-        @TestMetadata("WrongNumberOfGenericParameters.java")
-        public void testWrongNumberOfGenericParameters() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java");
+        @TestMetadata("ClassWithTypeP.java")
+        public void testClassWithTypeP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.java");
+        }
+        
+        @TestMetadata("ClassWithTypePExtendsIterableP.java")
+        public void testClassWithTypePExtendsIterableP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.java");
+        }
+        
+        @TestMetadata("ClassWithTypePP.java")
+        public void testClassWithTypePP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.java");
+        }
+        
+        @TestMetadata("ClassWithTypePRefNext.java")
+        public void testClassWithTypePRefNext() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.java");
+        }
+        
+        @TestMetadata("ClassWithTypePRefSelf.java")
+        public void testClassWithTypePRefSelf() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.java");
+        }
+        
+        @TestMetadata("ClassWithTypePRefSelfAndClass.java")
+        public void testClassWithTypePRefSelfAndClass() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.java");
+        }
+        
+        @TestMetadata("FieldAsVar.java")
+        public void testFieldAsVar() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.java");
+        }
+        
+        @TestMetadata("FieldOfArrayType.java")
+        public void testFieldOfArrayType() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.java");
+        }
+        
+        @TestMetadata("FinalFieldAsVal.java")
+        public void testFinalFieldAsVal() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.java");
+        }
+        
+        @TestMetadata("InheritMethodsDifferentReturnTypes.java")
+        public void testInheritMethodsDifferentReturnTypes() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.java");
+        }
+        
+        @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.java")
+        public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.java");
+        }
+        
+        @TestMetadata("InnerClass.java")
+        public void testInnerClass() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.java");
+        }
+        
+        @TestMetadata("InnerClassReferencesOuterTP.java")
+        public void testInnerClassReferencesOuterTP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.java");
+        }
+        
+        @TestMetadata("InnerClassesInGeneric.java")
+        public void testInnerClassesInGeneric() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.java");
+        }
+        
+        @TestMetadata("MethodReferencesOuterClassTP.java")
+        public void testMethodReferencesOuterClassTP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.java");
+        }
+        
+        @TestMetadata("MethodTypePOneUpperBound.java")
+        public void testMethodTypePOneUpperBound() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.java");
+        }
+        
+        @TestMetadata("MethodTypePTwoUpperBounds.java")
+        public void testMethodTypePTwoUpperBounds() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.java");
+        }
+        
+        @TestMetadata("MethodWithTypeP.java")
+        public void testMethodWithTypeP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.java");
+        }
+        
+        @TestMetadata("MethodWithTypePP.java")
+        public void testMethodWithTypePP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.java");
+        }
+        
+        @TestMetadata("MethodWithTypePRefClassP.java")
+        public void testMethodWithTypePRefClassP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.java");
+        }
+        
+        @TestMetadata("MethosWithPRefTP.java")
+        public void testMethosWithPRefTP() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.java");
+        }
+        
+        @TestMetadata("MyException.java")
+        public void testMyException() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.java");
+        }
+        
+        @TestMetadata("NestedClass.java")
+        public void testNestedClass() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.java");
+        }
+        
+        @TestMetadata("RemoveRedundantProjectionKind.java")
+        public void testRemoveRedundantProjectionKind() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.java");
+        }
+        
+        @TestMetadata("Simple.java")
+        public void testSimple() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.java");
+        }
+        
+        @TestMetadata("TwoFields.java")
+        public void testTwoFields() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.java");
+        }
+        
+        @TestMetadata("UnboundWildcard.java")
+        public void testUnboundWildcard() throws Exception {
+            doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.java");
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation")
+        public static class Annotation extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInAnnotation() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("AnnotatedAnnotation.java")
+            public void testAnnotatedAnnotation() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.java");
+            }
+            
+            @TestMetadata("AnnotatedMethod.java")
+            public void testAnnotatedMethod() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.java");
+            }
+            
+            @TestMetadata("SimpleAnnotation.java")
+            public void testSimpleAnnotation() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor")
+        public static class Constructor extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInConstructor() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("ConstructorGenericDeep.java")
+            public void testConstructorGenericDeep() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.java");
+            }
+            
+            @TestMetadata("ConstructorGenericSimple.java")
+            public void testConstructorGenericSimple() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.java");
+            }
+            
+            @TestMetadata("ConstructorGenericUpperBound.java")
+            public void testConstructorGenericUpperBound() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean")
+        public static class JavaBean extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInJavaBean() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("DifferentGetterAndSetter.java")
+            public void testDifferentGetterAndSetter() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.java");
+            }
+            
+            @TestMetadata("JavaBeanAbstractGetter.java")
+            public void testJavaBeanAbstractGetter() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.java");
+            }
+            
+            @TestMetadata("JavaBeanVal.java")
+            public void testJavaBeanVal() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.java");
+            }
+            
+            @TestMetadata("JavaBeanVar.java")
+            public void testJavaBeanVar() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.java");
+            }
+            
+            @TestMetadata("JavaBeanVarOfGenericType.java")
+            public void testJavaBeanVarOfGenericType() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.java");
+            }
+            
+            @TestMetadata("TwoSetters.java")
+            public void testTwoSetters() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature")
+        @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
+        public static class KotlinSignature extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInKotlinSignature() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("ArrayType.java")
+            public void testArrayType() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.java");
+            }
+            
+            @TestMetadata("ConstructorWithNewTypeParams.java")
+            public void testConstructorWithNewTypeParams() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java");
+            }
+            
+            @TestMetadata("ConstructorWithParentTypeParams.java")
+            public void testConstructorWithParentTypeParams() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java");
+            }
+            
+            @TestMetadata("ConstructorWithSeveralParams.java")
+            public void testConstructorWithSeveralParams() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java");
+            }
+            
+            @TestMetadata("ConstructorWithoutParams.java")
+            public void testConstructorWithoutParams() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java");
+            }
+            
+            @TestMetadata("CustomProjectionKind.java")
+            public void testCustomProjectionKind() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.java");
+            }
+            
+            @TestMetadata("MethodWithFunctionTypes.java")
+            public void testMethodWithFunctionTypes() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java");
+            }
+            
+            @TestMetadata("MethodWithGenerics.java")
+            public void testMethodWithGenerics() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.java");
+            }
+            
+            @TestMetadata("MethodWithMappedClasses.java")
+            public void testMethodWithMappedClasses() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.java");
+            }
+            
+            @TestMetadata("MethodWithTypeParameters.java")
+            public void testMethodWithTypeParameters() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.java");
+            }
+            
+            @TestMetadata("MethodWithVararg.java")
+            public void testMethodWithVararg() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.java");
+            }
+            
+            @TestMetadata("PropertyArrayTypes.java")
+            public void testPropertyArrayTypes() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.java");
+            }
+            
+            @TestMetadata("PropertyComplexTypes.java")
+            public void testPropertyComplexTypes() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.java");
+            }
+            
+            @TestMetadata("PropertySimpleType.java")
+            public void testPropertySimpleType() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.java");
+            }
+            
+            @TestMetadata("StarProjection.java")
+            public void testStarProjection() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.java");
+            }
+            
+            @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error")
+            public static class Error extends AbstractLoadJavaTest {
+                @TestMetadata("AddingNullability.java")
+                public void testAddingNullability() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.java");
+                }
+                
+                public void testAllFilesPresentInError() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true);
+                }
+                
+                @TestMetadata("ConflictingProjectionKind.java")
+                public void testConflictingProjectionKind() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java");
+                }
+                
+                @TestMetadata("ExplicitFieldGettersAndSetters.java")
+                public void testExplicitFieldGettersAndSetters() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.java");
+                }
+                
+                @TestMetadata("ExtraUpperBound.java")
+                public void testExtraUpperBound() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.java");
+                }
+                
+                @TestMetadata("MissingUpperBound.java")
+                public void testMissingUpperBound() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.java");
+                }
+                
+                @TestMetadata("NoFieldTypeRef.java")
+                public void testNoFieldTypeRef() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.java");
+                }
+                
+                @TestMetadata("NotVarargReplacedWithVararg.java")
+                public void testNotVarargReplacedWithVararg() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.java");
+                }
+                
+                @TestMetadata("RedundantProjectionKind.java")
+                public void testRedundantProjectionKind() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.java");
+                }
+                
+                @TestMetadata("ReturnTypeMissing.java")
+                public void testReturnTypeMissing() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java");
+                }
+                
+                @TestMetadata("SyntaxError.java")
+                public void testSyntaxError() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.java");
+                }
+                
+                @TestMetadata("SyntaxErrorInFieldAnnotation.java")
+                public void testSyntaxErrorInFieldAnnotation() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java");
+                }
+                
+                @TestMetadata("VarargReplacedWithNotVararg.java")
+                public void testVarargReplacedWithNotVararg() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.java");
+                }
+                
+                @TestMetadata("WrongFieldInitializer.java")
+                public void testWrongFieldInitializer() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.java");
+                }
+                
+                @TestMetadata("WrongFieldMutability.java")
+                public void testWrongFieldMutability() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.java");
+                }
+                
+                @TestMetadata("WrongFieldName.java")
+                public void testWrongFieldName() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.java");
+                }
+                
+                @TestMetadata("WrongMethodName.java")
+                public void testWrongMethodName() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.java");
+                }
+                
+                @TestMetadata("WrongProjectionKind.java")
+                public void testWrongProjectionKind() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.java");
+                }
+                
+                @TestMetadata("WrongReturnTypeStructure.java")
+                public void testWrongReturnTypeStructure() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java");
+                }
+                
+                @TestMetadata("WrongTypeName1.java")
+                public void testWrongTypeName1() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java");
+                }
+                
+                @TestMetadata("WrongTypeName2.java")
+                public void testWrongTypeName2() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java");
+                }
+                
+                @TestMetadata("WrongTypeName3.java")
+                public void testWrongTypeName3() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java");
+                }
+                
+                @TestMetadata("WrongTypeParameterBoundStructure1.java")
+                public void testWrongTypeParameterBoundStructure1() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
+                }
+                
+                @TestMetadata("WrongTypeParameterBoundStructure2.java")
+                public void testWrongTypeParameterBoundStructure2() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
+                }
+                
+                @TestMetadata("WrongTypeParametersCount.java")
+                public void testWrongTypeParametersCount() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.java");
+                }
+                
+                @TestMetadata("WrongValueParameterStructure1.java")
+                public void testWrongValueParameterStructure1() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java");
+                }
+                
+                @TestMetadata("WrongValueParameterStructure2.java")
+                public void testWrongValueParameterStructure2() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java");
+                }
+                
+                @TestMetadata("WrongValueParametersCount.java")
+                public void testWrongValueParametersCount() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.java");
+                }
+                
+            }
+            
+            @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation")
+            @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
+            public static class Propagation extends AbstractLoadJavaTest {
+                public void testAllFilesPresentInPropagation() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true);
+                }
+                
+                @TestMetadata("PropagateTypeArgumentNullable.java")
+                public void testPropagateTypeArgumentNullable() throws Exception {
+                    doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.java");
+                }
+                
+                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter")
+                public static class Parameter extends AbstractLoadJavaTest {
+                    public void testAllFilesPresentInParameter() throws Exception {
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true);
+                    }
+                    
+                    @TestMetadata("ChangeProjectionKind1.java")
+                    public void testChangeProjectionKind1() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java");
+                    }
+                    
+                    @TestMetadata("ChangeProjectionKind2.java")
+                    public void testChangeProjectionKind2() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java");
+                    }
+                    
+                    @TestMetadata("DeeplySubstitutedClassParameter.java")
+                    public void testDeeplySubstitutedClassParameter() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java");
+                    }
+                    
+                    @TestMetadata("DeeplySubstitutedClassParameter2.java")
+                    public void testDeeplySubstitutedClassParameter2() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java");
+                    }
+                    
+                    @TestMetadata("InheritMutability.java")
+                    public void testInheritMutability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.java");
+                    }
+                    
+                    @TestMetadata("InheritNotVararg.java")
+                    public void testInheritNotVararg() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.java");
+                    }
+                    
+                    @TestMetadata("InheritNotVarargInteger.java")
+                    public void testInheritNotVarargInteger() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java");
+                    }
+                    
+                    @TestMetadata("InheritNotVarargNotNull.java")
+                    public void testInheritNotVarargNotNull() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java");
+                    }
+                    
+                    @TestMetadata("InheritNotVarargPrimitive.java")
+                    public void testInheritNotVarargPrimitive() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java");
+                    }
+                    
+                    @TestMetadata("InheritNullability.java")
+                    public void testInheritNullability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java");
+                    }
+                    
+                    @TestMetadata("InheritProjectionKind.java")
+                    public void testInheritProjectionKind() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.java");
+                    }
+                    
+                    @TestMetadata("InheritReadOnliness.java")
+                    public void testInheritReadOnliness() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.java");
+                    }
+                    
+                    @TestMetadata("InheritVararg.java")
+                    public void testInheritVararg() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.java");
+                    }
+                    
+                    @TestMetadata("InheritVarargInteger.java")
+                    public void testInheritVarargInteger() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.java");
+                    }
+                    
+                    @TestMetadata("InheritVarargNotNull.java")
+                    public void testInheritVarargNotNull() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.java");
+                    }
+                    
+                    @TestMetadata("InheritVarargPrimitive.java")
+                    public void testInheritVarargPrimitive() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java");
+                    }
+                    
+                    @TestMetadata("Kt3302.java")
+                    public void testKt3302() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.java");
+                    }
+                    
+                    @TestMetadata("MutableToReadOnly.java")
+                    public void testMutableToReadOnly() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java");
+                    }
+                    
+                    @TestMetadata("NotNullToNullable.java")
+                    public void testNotNullToNullable() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java");
+                    }
+                    
+                    @TestMetadata("NullableToNotNull.java")
+                    public void testNullableToNotNull() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java");
+                    }
+                    
+                    @TestMetadata("NullableToNotNullKotlinSignature.java")
+                    public void testNullableToNotNullKotlinSignature() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java");
+                    }
+                    
+                    @TestMetadata("OverrideWithErasedParameter.java")
+                    public void testOverrideWithErasedParameter() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java");
+                    }
+                    
+                    @TestMetadata("ReadOnlyToMutable.java")
+                    public void testReadOnlyToMutable() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java");
+                    }
+                    
+                    @TestMetadata("SubclassFromGenericAndNot.java")
+                    public void testSubclassFromGenericAndNot() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java");
+                    }
+                    
+                    @TestMetadata("SubstitutedClassParameter.java")
+                    public void testSubstitutedClassParameter() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java");
+                    }
+                    
+                    @TestMetadata("SubstitutedClassParameters.java")
+                    public void testSubstitutedClassParameters() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java");
+                    }
+                    
+                }
+                
+                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return")
+                public static class Return extends AbstractLoadJavaTest {
+                    @TestMetadata("AddNotNullJavaSubtype.java")
+                    public void testAddNotNullJavaSubtype() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java");
+                    }
+                    
+                    @TestMetadata("AddNotNullSameJavaType.java")
+                    public void testAddNotNullSameJavaType() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java");
+                    }
+                    
+                    @TestMetadata("AddNullabilityJavaSubtype.java")
+                    public void testAddNullabilityJavaSubtype() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java");
+                    }
+                    
+                    @TestMetadata("AddNullabilitySameGenericType1.java")
+                    public void testAddNullabilitySameGenericType1() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java");
+                    }
+                    
+                    @TestMetadata("AddNullabilitySameGenericType2.java")
+                    public void testAddNullabilitySameGenericType2() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java");
+                    }
+                    
+                    @TestMetadata("AddNullabilitySameJavaType.java")
+                    public void testAddNullabilitySameJavaType() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java");
+                    }
+                    
+                    public void testAllFilesPresentInReturn() throws Exception {
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true);
+                    }
+                    
+                    @TestMetadata("CantMakeImmutableInSubclass.java")
+                    public void testCantMakeImmutableInSubclass() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java");
+                    }
+                    
+                    @TestMetadata("DeeplySubstitutedClassParameter.java")
+                    public void testDeeplySubstitutedClassParameter() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java");
+                    }
+                    
+                    @TestMetadata("DeeplySubstitutedClassParameter2.java")
+                    public void testDeeplySubstitutedClassParameter2() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java");
+                    }
+                    
+                    @TestMetadata("HalfSubstitutedTypeParameters.java")
+                    public void testHalfSubstitutedTypeParameters() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java");
+                    }
+                    
+                    @TestMetadata("InheritNullabilityGenericSubclassSimple.java")
+                    public void testInheritNullabilityGenericSubclassSimple() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java");
+                    }
+                    
+                    @TestMetadata("InheritNullabilityJavaSubtype.java")
+                    public void testInheritNullabilityJavaSubtype() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java");
+                    }
+                    
+                    @TestMetadata("InheritNullabilitySameGenericType.java")
+                    public void testInheritNullabilitySameGenericType() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java");
+                    }
+                    
+                    @TestMetadata("InheritNullabilitySameJavaType.java")
+                    public void testInheritNullabilitySameJavaType() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
+                    }
+                    
+                    @TestMetadata("InheritProjectionKind.java")
+                    public void testInheritProjectionKind() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.java");
+                    }
+                    
+                    @TestMetadata("InheritReadOnlinessOfArgument.java")
+                    public void testInheritReadOnlinessOfArgument() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
+                    }
+                    
+                    @TestMetadata("InheritReadOnlinessSameClass.java")
+                    public void testInheritReadOnlinessSameClass() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java");
+                    }
+                    
+                    @TestMetadata("InheritReadOnlinessSubclass.java")
+                    public void testInheritReadOnlinessSubclass() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
+                    }
+                    
+                    @TestMetadata("SameProjectionKind.java")
+                    public void testSameProjectionKind() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.java");
+                    }
+                    
+                    @TestMetadata("SubclassFromGenericAndNot.java")
+                    public void testSubclassFromGenericAndNot() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java");
+                    }
+                    
+                    @TestMetadata("SubclassOfCollection.java")
+                    public void testSubclassOfCollection() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.java");
+                    }
+                    
+                    @TestMetadata("SubclassOfMapEntry.java")
+                    public void testSubclassOfMapEntry() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.java");
+                    }
+                    
+                    @TestMetadata("SubstitutedClassParameter.java")
+                    public void testSubstitutedClassParameter() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java");
+                    }
+                    
+                    @TestMetadata("SubstitutedClassParameters.java")
+                    public void testSubstitutedClassParameters() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesConflictingProjectionKinds.java")
+                    public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.java")
+                    public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.java")
+                    public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesMutableAndNot.java")
+                    public void testTwoSuperclassesMutableAndNot() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesReturnJavaSubtype.java")
+                    public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesReturnSameJavaType.java")
+                    public void testTwoSuperclassesReturnSameJavaType() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclassesSupplementNotNull.java")
+                    public void testTwoSuperclassesSupplementNotNull() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java");
+                    }
+                    
+                    @TestMetadata("TypeParamOfClass.java")
+                    public void testTypeParamOfClass() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.java");
+                    }
+                    
+                    @TestMetadata("TypeParamOfClassSubstituted.java")
+                    public void testTypeParamOfClassSubstituted() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java");
+                    }
+                    
+                    @TestMetadata("TypeParamOfFun.java")
+                    public void testTypeParamOfFun() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.java");
+                    }
+                    
+                }
+                
+                @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter")
+                public static class TypeParameter extends AbstractLoadJavaTest {
+                    public void testAllFilesPresentInTypeParameter() throws Exception {
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true);
+                    }
+                    
+                    @TestMetadata("InheritMutability.java")
+                    public void testInheritMutability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.java");
+                    }
+                    
+                    @TestMetadata("InheritNullability.java")
+                    public void testInheritNullability() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.java");
+                    }
+                    
+                    @TestMetadata("InheritReadOnliness.java")
+                    public void testInheritReadOnliness() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java");
+                    }
+                    
+                    @TestMetadata("TwoBounds.java")
+                    public void testTwoBounds() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.java");
+                    }
+                    
+                    @TestMetadata("TwoSuperclasses.java")
+                    public void testTwoSuperclasses() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java");
+                    }
+                    
+                    @TestMetadata("TwoTypeParameters.java")
+                    public void testTwoTypeParameters() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java");
+                    }
+                    
+                    @TestMetadata("UseParameterAsUpperBound.java")
+                    public void testUseParameterAsUpperBound() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java");
+                    }
+                    
+                    @TestMetadata("UseParameterInUpperBound.java")
+                    public void testUseParameterInUpperBound() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java");
+                    }
+                    
+                    @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.java")
+                    public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
+                        doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java");
+                    }
+                    
+                }
+                
+                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/compiledJavaCompareWithKotlin/library")
+        public static class Library extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInLibrary() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("LoadIterable.java")
+            public void testLoadIterable() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.java");
+            }
+            
+            @TestMetadata("LoadIterator.java")
+            public void testLoadIterator() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality")
+        public static class Modality extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInModality() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("ModalityOfFakeOverrides.java")
+            public void testModalityOfFakeOverrides() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability")
+        public static class Mutability extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInMutability() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("LoadIterable.java")
+            public void testLoadIterable() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.java");
+            }
+            
+            @TestMetadata("LoadIterableWithConflict.java")
+            public void testLoadIterableWithConflict() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.java");
+            }
+            
+            @TestMetadata("LoadIterableWithNullability.java")
+            public void testLoadIterableWithNullability() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.java");
+            }
+            
+            @TestMetadata("LoadIterableWithPropagation.java")
+            public void testLoadIterableWithPropagation() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull")
+        public static class NotNull extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInNotNull() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("NotNullField.java")
+            public void testNotNullField() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.java");
+            }
+            
+            @TestMetadata("NotNullMethod.java")
+            public void testNotNullMethod() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.java");
+            }
+            
+            @TestMetadata("NotNullParameter.java")
+            public void testNotNullParameter() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.java");
+            }
+            
+        }
+        
+        @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg")
+        public static class Vararg extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInVararg() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg"), Pattern.compile("^(.+)\\.java$"), true);
+            }
+            
+            @TestMetadata("VarargInt.java")
+            public void testVarargInt() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.java");
+            }
+            
+            @TestMetadata("VarargString.java")
+            public void testVarargString() throws Exception {
+                doTestCompiledJavaCompareWithKotlin("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.java");
+            }
+            
+        }
+        
+        public static Test innerSuite() {
+            TestSuite suite = new TestSuite("CompiledJavaCompareWithKotlin");
+            suite.addTestSuite(CompiledJavaCompareWithKotlin.class);
+            suite.addTestSuite(Annotation.class);
+            suite.addTestSuite(Constructor.class);
+            suite.addTestSuite(JavaBean.class);
+            suite.addTest(KotlinSignature.innerSuite());
+            suite.addTestSuite(Library.class);
+            suite.addTestSuite(Modality.class);
+            suite.addTestSuite(Mutability.class);
+            suite.addTestSuite(NotNull.class);
+            suite.addTestSuite(Vararg.class);
+            return suite;
+        }
+    }
+    
+    @TestMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods")
+    public static class CompiledJavaIncludeObjectMethods extends AbstractLoadJavaTest {
+        public void testAllFilesPresentInCompiledJavaIncludeObjectMethods() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+        
+        @TestMetadata("ClassWithObjectMethod.java")
+        public void testClassWithObjectMethod() throws Exception {
+            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java");
+        }
+        
+        @TestMetadata("InterfaceWithObjectMethods.java")
+        public void testInterfaceWithObjectMethods() throws Exception {
+            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java");
         }
         
     }
@@ -1637,33 +1623,47 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
     }
     
-    @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin")
-    @InnerTestClasses({})
-    public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest {
-        public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaAndKotlin"), Pattern.compile("^(.+)\\.txt$"), true);
+    @TestMetadata("compiler/testData/loadJava/sourceJava")
+    public static class SourceJava extends AbstractLoadJavaTest {
+        public void testAllFilesPresentInSourceJava() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true);
         }
         
-        @TestMetadata("MixedPackage.txt")
-        public void testMixedPackage() throws Exception {
-            doTestCompiledJavaAndKotlin("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt");
+        @TestMetadata("ClassExtendsTypeParameter.java")
+        public void testClassExtendsTypeParameter() throws Exception {
+            doTestSourceJava("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java");
         }
         
-        public static Test innerSuite() {
-            TestSuite suite = new TestSuite("CompiledJavaAndKotlin");
-            suite.addTestSuite(CompiledJavaAndKotlin.class);
-            return suite;
+        @TestMetadata("ErrorTypes.java")
+        public void testErrorTypes() throws Exception {
+            doTestSourceJava("compiler/testData/loadJava/sourceJava/ErrorTypes.java");
         }
+        
+        @TestMetadata("ReturnInnerSubclassOfSupersInner.java")
+        public void testReturnInnerSubclassOfSupersInner() throws Exception {
+            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java");
+        }
+        
+        @TestMetadata("ReturnNotSubtype.java")
+        public void testReturnNotSubtype() throws Exception {
+            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java");
+        }
+        
+        @TestMetadata("WrongNumberOfGenericParameters.java")
+        public void testWrongNumberOfGenericParameters() throws Exception {
+            doTestSourceJava("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java");
+        }
+        
     }
     
     public static Test suite() {
         TestSuite suite = new TestSuite("LoadJavaTestGenerated");
+        suite.addTest(CompiledJava.innerSuite());
+        suite.addTest(CompiledJavaAndKotlin.innerSuite());
         suite.addTest(CompiledJavaCompareWithKotlin.innerSuite());
         suite.addTestSuite(CompiledJavaIncludeObjectMethods.class);
-        suite.addTest(CompiledJava.innerSuite());
-        suite.addTestSuite(SourceJava.class);
         suite.addTest(JavaAgainstKotlin.innerSuite());
-        suite.addTest(CompiledJavaAndKotlin.innerSuite());
+        suite.addTestSuite(SourceJava.class);
         return suite;
     }
 }
diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java
index 666663205d5..9809b20d44b 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java
@@ -189,24 +189,17 @@ public class GenerateTests {
         );
 
 
-        generateTest(
-                "compiler/tests/",
-                "LoadCompiledKotlinTestGenerated",
-                AbstractLoadCompiledKotlinTest.class,
-                testModel("compiler/testData/loadKotlin", "doTest")
-        );
-
         generateTest(
                 "compiler/tests/",
                 "LoadJavaTestGenerated",
                 AbstractLoadJavaTest.class,
-                testModel("compiler/testData/loadJava/compiledJavaCompareWithKotlin", true, "java", "doTest"),
+                testModel("compiler/testData/loadJava/compiledJava", true, "java", "doTestCompiledJava"),
+                testModel("compiler/testData/loadJava/compiledJavaAndKotlin", true, "txt", "doTestCompiledJavaAndKotlin"),
+                testModel("compiler/testData/loadJava/compiledJavaCompareWithKotlin", true, "java", "doTestCompiledJavaCompareWithKotlin"),
                 testModel("compiler/testData/loadJava/compiledJavaIncludeObjectMethods", true, "java",
                           "doTestCompiledJavaIncludeObjectMethods"),
-                testModel("compiler/testData/loadJava/compiledJava", true, "java", "doTestCompiledJava"),
-                testModel("compiler/testData/loadJava/sourceJava", true, "java", "doTestSourceJava"),
                 testModel("compiler/testData/loadJava/javaAgainstKotlin", true, "txt", "doTestJavaAgainstKotlin"),
-                testModel("compiler/testData/loadJava/compiledJavaAndKotlin", true, "txt", "doTestCompiledJavaAndKotlin")
+                testModel("compiler/testData/loadJava/sourceJava", true, "java", "doTestSourceJava")
         );
 
         generateTest(