diff --git a/compiler/testData/lazyResolve/namespaceComparator/AnnotationOnObject.kt b/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/AnnotationOnObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/AnnotationOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/AnnotationOnObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt b/compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/ClassObject.txt b/compiler/testData/lazyResolve/recursiveComparator/ClassObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/ClassObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/ClassObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt b/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt rename to compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt b/compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt rename to compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt rename to compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt b/compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt rename to compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/UnresolvedAnnotationOnObject.kt b/compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/UnresolvedAnnotationOnObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/UnresolvedAnnotationOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/UnresolvedAnnotationOnObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/WrongAnnotationArgsOnObject.kt b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/WrongAnnotationArgsOnObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/WrongAnnotationArgsOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/WrongAnnotationArgsOnObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.kt b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.kt rename to compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt b/compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.txt rename to compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.kt b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.kt rename to compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt b/compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt rename to compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.kt b/compiler/testData/lazyResolve/recursiveComparator/enum.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/enum.kt rename to compiler/testData/lazyResolve/recursiveComparator/enum.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/recursiveComparator/enum.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/enum.txt rename to compiler/testData/lazyResolve/recursiveComparator/enum.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt rename to compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt b/compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt rename to compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt b/compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt rename to compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt b/compiler/testData/lazyResolve/recursiveComparator/genericFunction.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt rename to compiler/testData/lazyResolve/recursiveComparator/genericFunction.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImport.kt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImport.kt rename to compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImport.txt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImport.txt rename to compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImportAfterNamedImport.kt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImportAfterNamedImport.kt rename to compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImportAfterNamedImport.txt b/compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImportAfterNamedImport.txt rename to compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.kt b/compiler/testData/lazyResolve/recursiveComparator/objectInClass.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/objectInClass.kt rename to compiler/testData/lazyResolve/recursiveComparator/objectInClass.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt b/compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/objectInClass.txt rename to compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.kt b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/objectMembers.kt rename to compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt b/compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt rename to compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt b/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt b/compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.kt b/compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.kt rename to compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.txt b/compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.txt rename to compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/resolveFunctionInsideClassObject.kt b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/resolveFunctionInsideClassObject.kt rename to compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/resolveFunctionInsideClassObject.txt b/compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/resolveFunctionInsideClassObject.txt rename to compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.kt b/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.kt rename to compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.txt b/compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.txt rename to compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt b/compiler/testData/lazyResolve/recursiveComparator/simpleClass.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt rename to compiler/testData/lazyResolve/recursiveComparator/simpleClass.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt rename to compiler/testData/lazyResolve/recursiveComparator/simpleClass.txt diff --git a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt b/compiler/testData/lazyResolve/recursiveComparator/varargIterator.kt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt rename to compiler/testData/lazyResolve/recursiveComparator/varargIterator.kt diff --git a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt b/compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt similarity index 100% rename from compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt rename to compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java rename to compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java index cb0a37e5412..ca55f3a4310 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java @@ -38,7 +38,7 @@ import java.util.Map; import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.ALLOW_ERROR_TYPES; import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.FORBID_ERROR_TYPES; -public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTestWithEnvironment { +public abstract class AbstractLazyResolveRecursiveComparingTest extends KotlinTestWithEnvironment { @Override protected JetCoreEnvironment createEnvironment() { @@ -73,10 +73,10 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe FqName test = new FqName("test"); PackageViewDescriptor actual = lazyModule.getPackage(test); - Assert.assertNotNull("Namespace for name " + test + " is null after lazy resolve", actual); + Assert.assertNotNull("Package for name " + test + " is null after lazy resolve", actual); PackageViewDescriptor expected = eagerModule.getPackage(test); - Assert.assertNotNull("Namespace for name " + test + " is null after eager resolve", expected); + Assert.assertNotNull("Package for name " + test + " is null after eager resolve", expected); File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java rename to compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java index ea880d7241e..08c564dc585 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java @@ -26,28 +26,28 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; +import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveRecursiveComparingTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.CompiledKotlin.class, LazyResolveNamespaceComparingTestGenerated.CompiledJavaCompareWithKotlin.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) -public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest { +@InnerTestClasses({LazyResolveRecursiveComparingTestGenerated.CompiledKotlin.class, LazyResolveRecursiveComparingTestGenerated.CompiledJavaCompareWithKotlin.class, LazyResolveRecursiveComparingTestGenerated.RecursiveComparator.class}) +public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin") @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class}) - public static class CompiledKotlin extends AbstractLazyResolveNamespaceComparingTest { + public static class CompiledKotlin extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class}) - public static class Annotations extends AbstractLazyResolveNamespaceComparingTest { + public static class Annotations extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers") - public static class ClassMembers extends AbstractLazyResolveNamespaceComparingTest { + public static class ClassMembers extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -90,7 +90,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes") - public static class Classes extends AbstractLazyResolveNamespaceComparingTest { + public static class Classes extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -153,7 +153,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers") - public static class PackageMembers extends AbstractLazyResolveNamespaceComparingTest { + public static class PackageMembers extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPackageMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -191,7 +191,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters") - public static class Parameters extends AbstractLazyResolveNamespaceComparingTest { + public static class Parameters extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -254,7 +254,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields") - public static class PropertiesWithoutBackingFields extends AbstractLazyResolveNamespaceComparingTest { + public static class PropertiesWithoutBackingFields extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -314,7 +314,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") - public static class Class extends AbstractLazyResolveNamespaceComparingTest { + public static class Class extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -487,7 +487,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun") - public static class ClassFun extends AbstractLazyResolveNamespaceComparingTest { + public static class ClassFun extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -525,7 +525,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject") - public static class ClassObject extends AbstractLazyResolveNamespaceComparingTest { + public static class ClassObject extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -594,7 +594,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @InnerTestClasses({Constructor.Vararg.class}) - public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { + public static class Constructor extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -665,7 +665,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg") - public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { + public static class Vararg extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -691,7 +691,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass") - public static class DataClass extends AbstractLazyResolveNamespaceComparingTest { + public static class DataClass extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInDataClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -734,7 +734,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum") - public static class Enum extends AbstractLazyResolveNamespaceComparingTest { + public static class Enum extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -763,7 +763,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) - public static class Fun extends AbstractLazyResolveNamespaceComparingTest { + public static class Fun extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -814,7 +814,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables") - public static class GenericWithTypeVariables extends AbstractLazyResolveNamespaceComparingTest { + public static class GenericWithTypeVariables extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -872,7 +872,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables") - public static class GenericWithoutTypeVariables extends AbstractLazyResolveNamespaceComparingTest { + public static class GenericWithoutTypeVariables extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -905,7 +905,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric") - public static class NonGeneric extends AbstractLazyResolveNamespaceComparingTest { + public static class NonGeneric extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInNonGeneric() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -993,7 +993,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg") - public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { + public static class Vararg extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1017,7 +1017,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline") - public static class Inline extends AbstractLazyResolveNamespaceComparingTest { + public static class Inline extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1031,7 +1031,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @InnerTestClasses({Prop.DefaultAccessors.class}) - public static class Prop extends AbstractLazyResolveNamespaceComparingTest { + public static class Prop extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInProp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1192,7 +1192,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors") - public static class DefaultAccessors extends AbstractLazyResolveNamespaceComparingTest { + public static class DefaultAccessors extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1263,7 +1263,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/type") - public static class Type extends AbstractLazyResolveNamespaceComparingTest { + public static class Type extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1416,7 +1416,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility") - public static class Visibility extends AbstractLazyResolveNamespaceComparingTest { + public static class Visibility extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1494,7 +1494,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @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 AbstractLazyResolveNamespaceComparingTest { + public static class CompiledJavaCompareWithKotlin extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInCompiledJavaCompareWithKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1645,7 +1645,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation") - public static class Annotation extends AbstractLazyResolveNamespaceComparingTest { + public static class Annotation extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInAnnotation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1668,7 +1668,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor") - public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { + public static class Constructor extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1691,7 +1691,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean") - public static class JavaBean extends AbstractLazyResolveNamespaceComparingTest { + public static class JavaBean extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInJavaBean() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1730,7 +1730,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) - public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { + public static class KotlinSignature extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1811,7 +1811,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error") - public static class Error extends AbstractLazyResolveNamespaceComparingTest { + public static class Error extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt"); @@ -1955,7 +1955,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) - public static class Propagation extends AbstractLazyResolveNamespaceComparingTest { + public static class Propagation extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -1966,7 +1966,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter") - public static class Parameter extends AbstractLazyResolveNamespaceComparingTest { + public static class Parameter extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2104,7 +2104,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return") - public static class Return extends AbstractLazyResolveNamespaceComparingTest { + public static class Return extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); @@ -2282,7 +2282,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter") - public static class TypeParameter extends AbstractLazyResolveNamespaceComparingTest { + public static class TypeParameter extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2354,7 +2354,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library") - public static class Library extends AbstractLazyResolveNamespaceComparingTest { + public static class Library extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2372,7 +2372,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality") - public static class Modality extends AbstractLazyResolveNamespaceComparingTest { + public static class Modality extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInModality() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2385,7 +2385,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability") - public static class Mutability extends AbstractLazyResolveNamespaceComparingTest { + public static class Mutability extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInMutability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2413,7 +2413,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull") - public static class NotNull extends AbstractLazyResolveNamespaceComparingTest { + public static class NotNull extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInNotNull() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2436,7 +2436,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg") - public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { + public static class Vararg extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -2469,124 +2469,124 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } } - @TestMetadata("compiler/testData/lazyResolve/namespaceComparator") - public static class NamespaceComparator extends AbstractLazyResolveNamespaceComparingTest { - public void testAllFilesPresentInNamespaceComparator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/lazyResolve/namespaceComparator"), Pattern.compile("^(.+)\\.kt$"), true); + @TestMetadata("compiler/testData/lazyResolve/recursiveComparator") + public static class RecursiveComparator extends AbstractLazyResolveRecursiveComparingTest { + public void testAllFilesPresentInRecursiveComparator() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/lazyResolve/recursiveComparator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationOnObject.kt") public void testAnnotationOnObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/AnnotationOnObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.kt"); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt"); } @TestMetadata("classObjectAnnotation.kt") public void testClassObjectAnnotation() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt"); } @TestMetadata("classObjectHeader.kt") public void testClassObjectHeader() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt"); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/enum.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/enum.kt"); } @TestMetadata("fileDependencyRecursion.kt") public void testFileDependencyRecursion() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt"); } @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt"); } @TestMetadata("importFunctionWithAllUnderImport.kt") public void testImportFunctionWithAllUnderImport() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImport.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt"); } @TestMetadata("importFunctionWithAllUnderImportAfterNamedImport.kt") public void testImportFunctionWithAllUnderImportAfterNamedImport() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/importFunctionWithAllUnderImportAfterNamedImport.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.kt"); } @TestMetadata("InnerClassNameClash.kt") public void testInnerClassNameClash() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.kt"); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/objectInClass.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/objectInClass.kt"); } @TestMetadata("objectMembers.kt") public void testObjectMembers() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/objectMembers.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt"); } @TestMetadata("OverrideWithErrors.kt") public void testOverrideWithErrors() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt"); } @TestMetadata("packageLevelObject.kt") public void testPackageLevelObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt"); } @TestMetadata("propertyClassFileDependencyRecursion.kt") public void testPropertyClassFileDependencyRecursion() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.kt"); } @TestMetadata("resolveFunctionInsideClassObject.kt") public void testResolveFunctionInsideClassObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/resolveFunctionInsideClassObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt"); } @TestMetadata("sameClassNameResolve.kt") public void testSameClassNameResolve() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt"); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/simpleClass.kt"); } @TestMetadata("UnresolvedAnnotationOnObject.kt") public void testUnresolvedAnnotationOnObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/UnresolvedAnnotationOnObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.kt"); } @TestMetadata("varargIterator.kt") public void testVarargIterator() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/varargIterator.kt"); } @TestMetadata("WrongAnnotationArgsOnObject.kt") public void testWrongAnnotationArgsOnObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/WrongAnnotationArgsOnObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt"); } } public static Test suite() { - TestSuite suite = new TestSuite("LazyResolveNamespaceComparingTestGenerated"); + TestSuite suite = new TestSuite("LazyResolveRecursiveComparingTestGenerated"); suite.addTest(CompiledKotlin.innerSuite()); suite.addTest(CompiledJavaCompareWithKotlin.innerSuite()); - suite.addTestSuite(NamespaceComparator.class); + suite.addTestSuite(RecursiveComparator.class); return suite; } } diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index cecb559d0f0..324462e5e4c 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -36,7 +36,7 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest -import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest +import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveRecursiveComparingTest import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest import org.jetbrains.jet.descriptors.serialization.AbstractDescriptorSerializationTest import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest @@ -172,10 +172,10 @@ fun main(args: Array) { model("resolve/imports", recursive = false, extension = "resolve") } - testClass(javaClass()) { + testClass(javaClass()) { model("loadJava/compiledKotlin", testMethod = "doTestCheckingPrimaryConstructorsAndAccessors") model("loadJava/compiledJavaCompareWithKotlin", testMethod = "doTestNotCheckingPrimaryConstructors") - model("lazyResolve/namespaceComparator", testMethod = "doTestCheckingPrimaryConstructors") + model("lazyResolve/recursiveComparator", testMethod = "doTestCheckingPrimaryConstructors") } testClass(javaClass()) {