From 9e1c0ea16e96224eb6e79064947e1218b0281dc0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 6 Mar 2013 15:41:51 +0400 Subject: [PATCH] Updated generated tests according to moving general load Java tests to subdirectory. --- .../jvm/compiler/LoadJavaTestGenerated.java | 376 ++++++++--------- ...esolveNamespaceComparingTestGenerated.java | 388 +++++++++--------- .../jet/generators/tests/GenerateTests.java | 4 +- 3 files changed, 384 insertions(+), 384 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 41c1a8ac7bd04..7ccbf91d6cbfe 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -30,834 +30,834 @@ /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/loadJava") +@TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin") @InnerTestClasses({LoadJavaTestGenerated.Annotation.class, LoadJavaTestGenerated.Constructor.class, LoadJavaTestGenerated.JavaBean.class, LoadJavaTestGenerated.KotlinSignature.class, LoadJavaTestGenerated.Library.class, LoadJavaTestGenerated.Modality.class, LoadJavaTestGenerated.NotNull.class, LoadJavaTestGenerated.Vararg.class}) public class LoadJavaTestGenerated extends AbstractLoadJavaTest { - public void testAllFilesPresentInLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), Pattern.compile("^(.+)\\.java$"), true); + 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/ArrayTypeVariance.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.java"); } @TestMetadata("ClassDoesNotOverrideMethod.java") public void testClassDoesNotOverrideMethod() throws Exception { - doTest("compiler/testData/loadJava/ClassDoesNotOverrideMethod.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.java"); } @TestMetadata("ClassWithTypeP.java") public void testClassWithTypeP() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypeP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.java"); } @TestMetadata("ClassWithTypePExtendsIterableP.java") public void testClassWithTypePExtendsIterableP() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypePExtendsIterableP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.java"); } @TestMetadata("ClassWithTypePP.java") public void testClassWithTypePP() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypePP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.java"); } @TestMetadata("ClassWithTypePRefNext.java") public void testClassWithTypePRefNext() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypePRefNext.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.java"); } @TestMetadata("ClassWithTypePRefSelf.java") public void testClassWithTypePRefSelf() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypePRefSelf.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.java"); } @TestMetadata("ClassWithTypePRefSelfAndClass.java") public void testClassWithTypePRefSelfAndClass() throws Exception { - doTest("compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.java"); } @TestMetadata("FieldAsVar.java") public void testFieldAsVar() throws Exception { - doTest("compiler/testData/loadJava/FieldAsVar.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.java"); } @TestMetadata("FieldOfArrayType.java") public void testFieldOfArrayType() throws Exception { - doTest("compiler/testData/loadJava/FieldOfArrayType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.java"); } @TestMetadata("FinalFieldAsVal.java") public void testFinalFieldAsVal() throws Exception { - doTest("compiler/testData/loadJava/FinalFieldAsVal.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.java"); } @TestMetadata("InnerClass.java") public void testInnerClass() throws Exception { - doTest("compiler/testData/loadJava/InnerClass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.java"); } @TestMetadata("InnerClassReferencesOuterTP.java") public void testInnerClassReferencesOuterTP() throws Exception { - doTest("compiler/testData/loadJava/InnerClassReferencesOuterTP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.java"); } @TestMetadata("InnerClassesInGeneric.java") public void testInnerClassesInGeneric() throws Exception { - doTest("compiler/testData/loadJava/InnerClassesInGeneric.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.java"); } @TestMetadata("MethodReferencesOuterClassTP.java") public void testMethodReferencesOuterClassTP() throws Exception { - doTest("compiler/testData/loadJava/MethodReferencesOuterClassTP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.java"); } @TestMetadata("MethodTypePOneUpperBound.java") public void testMethodTypePOneUpperBound() throws Exception { - doTest("compiler/testData/loadJava/MethodTypePOneUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.java"); } @TestMetadata("MethodTypePTwoUpperBounds.java") public void testMethodTypePTwoUpperBounds() throws Exception { - doTest("compiler/testData/loadJava/MethodTypePTwoUpperBounds.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.java"); } @TestMetadata("MethodWithTypeP.java") public void testMethodWithTypeP() throws Exception { - doTest("compiler/testData/loadJava/MethodWithTypeP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.java"); } @TestMetadata("MethodWithTypePP.java") public void testMethodWithTypePP() throws Exception { - doTest("compiler/testData/loadJava/MethodWithTypePP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.java"); } @TestMetadata("MethodWithTypePRefClassP.java") public void testMethodWithTypePRefClassP() throws Exception { - doTest("compiler/testData/loadJava/MethodWithTypePRefClassP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.java"); } @TestMetadata("MethosWithPRefTP.java") public void testMethosWithPRefTP() throws Exception { - doTest("compiler/testData/loadJava/MethosWithPRefTP.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.java"); } @TestMetadata("MyException.java") public void testMyException() throws Exception { - doTest("compiler/testData/loadJava/MyException.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.java"); } @TestMetadata("NestedClass.java") public void testNestedClass() throws Exception { - doTest("compiler/testData/loadJava/NestedClass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.java"); } @TestMetadata("RemoveRedundantProjectionKind.java") public void testRemoveRedundantProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/RemoveRedundantProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.java"); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - doTest("compiler/testData/loadJava/Simple.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.java"); } @TestMetadata("TwoFields.java") public void testTwoFields() throws Exception { - doTest("compiler/testData/loadJava/TwoFields.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.java"); } @TestMetadata("UnboundWildcard.java") public void testUnboundWildcard() throws Exception { - doTest("compiler/testData/loadJava/UnboundWildcard.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.java"); } - @TestMetadata("compiler/testData/loadJava/annotation") + @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/annotation"), Pattern.compile("^(.+)\\.java$"), true); + 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/annotation/AnnotatedAnnotation.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.java"); } @TestMetadata("AnnotatedMethod.java") public void testAnnotatedMethod() throws Exception { - doTest("compiler/testData/loadJava/annotation/AnnotatedMethod.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.java"); } @TestMetadata("SimpleAnnotation.java") public void testSimpleAnnotation() throws Exception { - doTest("compiler/testData/loadJava/annotation/SimpleAnnotation.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.java"); } } - @TestMetadata("compiler/testData/loadJava/constructor") + @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/constructor"), Pattern.compile("^(.+)\\.java$"), true); + 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/constructor/ConstructorGenericDeep.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.java"); } @TestMetadata("ConstructorGenericSimple.java") public void testConstructorGenericSimple() throws Exception { - doTest("compiler/testData/loadJava/constructor/ConstructorGenericSimple.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.java"); } @TestMetadata("ConstructorGenericUpperBound.java") public void testConstructorGenericUpperBound() throws Exception { - doTest("compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.java"); } } - @TestMetadata("compiler/testData/loadJava/javaBean") + @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/javaBean"), Pattern.compile("^(.+)\\.java$"), true); + 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/javaBean/DifferentGetterAndSetter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.java"); } @TestMetadata("JavaBeanAbstractGetter.java") public void testJavaBeanAbstractGetter() throws Exception { - doTest("compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.java"); } @TestMetadata("JavaBeanVal.java") public void testJavaBeanVal() throws Exception { - doTest("compiler/testData/loadJava/javaBean/JavaBeanVal.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.java"); } @TestMetadata("JavaBeanVar.java") public void testJavaBeanVar() throws Exception { - doTest("compiler/testData/loadJava/javaBean/JavaBeanVar.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.java"); } @TestMetadata("JavaBeanVarOfGenericType.java") public void testJavaBeanVarOfGenericType() throws Exception { - doTest("compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.java"); } @TestMetadata("TwoSetters.java") public void testTwoSetters() throws Exception { - doTest("compiler/testData/loadJava/javaBean/TwoSetters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.java"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature") + @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/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/ArrayType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.java"); } @TestMetadata("ConstructorWithNewTypeParams.java") public void testConstructorWithNewTypeParams() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.java"); } @TestMetadata("ConstructorWithParentTypeParams.java") public void testConstructorWithParentTypeParams() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.java"); } @TestMetadata("ConstructorWithSeveralParams.java") public void testConstructorWithSeveralParams() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.java"); } @TestMetadata("ConstructorWithoutParams.java") public void testConstructorWithoutParams() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.java"); } @TestMetadata("CustomProjectionKind.java") public void testCustomProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.java"); } @TestMetadata("MethodWithFunctionTypes.java") public void testMethodWithFunctionTypes() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.java"); } @TestMetadata("MethodWithGenerics.java") public void testMethodWithGenerics() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.java"); } @TestMetadata("MethodWithMappedClasses.java") public void testMethodWithMappedClasses() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.java"); } @TestMetadata("MethodWithTypeParameters.java") public void testMethodWithTypeParameters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.java"); } @TestMetadata("MethodWithVararg.java") public void testMethodWithVararg() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/MethodWithVararg.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.java"); } @TestMetadata("PropertyArrayTypes.java") public void testPropertyArrayTypes() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.java"); } @TestMetadata("PropertyComplexTypes.java") public void testPropertyComplexTypes() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.java"); } @TestMetadata("PropertySimpleType.java") public void testPropertySimpleType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.java"); } @TestMetadata("StarProjection.java") public void testStarProjection() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/StarProjection.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.java"); } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/error") + @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/kotlinSignature/error/AddingNullability.java"); + 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/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/error/ConflictingProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.java"); } @TestMetadata("ExplicitFieldGettersAndSetters.java") public void testExplicitFieldGettersAndSetters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); } @TestMetadata("ExtraUpperBound.java") public void testExtraUpperBound() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.java"); } @TestMetadata("MissingUpperBound.java") public void testMissingUpperBound() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.java"); } @TestMetadata("NoFieldTypeRef.java") public void testNoFieldTypeRef() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.java"); } @TestMetadata("NotVarargReplacedWithVararg.java") public void testNotVarargReplacedWithVararg() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.java"); } @TestMetadata("RedundantProjectionKind.java") public void testRedundantProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/RedundantProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.java"); } @TestMetadata("ReturnTypeMissing.java") public void testReturnTypeMissing() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.java"); } @TestMetadata("SyntaxError.java") public void testSyntaxError() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/SyntaxError.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.java"); } @TestMetadata("SyntaxErrorInFieldAnnotation.java") public void testSyntaxErrorInFieldAnnotation() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); } @TestMetadata("VarargReplacedWithNotVararg.java") public void testVarargReplacedWithNotVararg() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.java"); } @TestMetadata("WrongFieldInitializer.java") public void testWrongFieldInitializer() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.java"); } @TestMetadata("WrongFieldMutability.java") public void testWrongFieldMutability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.java"); } @TestMetadata("WrongFieldName.java") public void testWrongFieldName() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.java"); } @TestMetadata("WrongMethodName.java") public void testWrongMethodName() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.java"); } @TestMetadata("WrongProjectionKind.java") public void testWrongProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.java"); } @TestMetadata("WrongReturnTypeStructure.java") public void testWrongReturnTypeStructure() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.java"); } @TestMetadata("WrongTypeName1.java") public void testWrongTypeName1() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.java"); } @TestMetadata("WrongTypeName2.java") public void testWrongTypeName2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.java"); } @TestMetadata("WrongTypeName3.java") public void testWrongTypeName3() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.java"); } @TestMetadata("WrongTypeParameterBoundStructure1.java") public void testWrongTypeParameterBoundStructure1() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); } @TestMetadata("WrongTypeParameterBoundStructure2.java") public void testWrongTypeParameterBoundStructure2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); } @TestMetadata("WrongTypeParametersCount.java") public void testWrongTypeParametersCount() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.java"); } @TestMetadata("WrongValueParameterStructure1.java") public void testWrongValueParameterStructure1() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.java"); } @TestMetadata("WrongValueParameterStructure2.java") public void testWrongValueParameterStructure2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.java"); } @TestMetadata("WrongValueParametersCount.java") public void testWrongValueParametersCount() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.java"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation") + @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/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/propagation/PropagateTypeArgumentNullable.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.java"); } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/parameter") + @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/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java"); } @TestMetadata("ChangeProjectionKind2.java") public void testChangeProjectionKind2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java"); } @TestMetadata("DeeplySubstitutedClassParameter.java") public void testDeeplySubstitutedClassParameter() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java"); } @TestMetadata("DeeplySubstitutedClassParameter2.java") public void testDeeplySubstitutedClassParameter2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java"); } @TestMetadata("InheritMutability.java") public void testInheritMutability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.java"); } @TestMetadata("InheritNotVararg.java") public void testInheritNotVararg() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.java"); } @TestMetadata("InheritNotVarargInteger.java") public void testInheritNotVarargInteger() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java"); } @TestMetadata("InheritNotVarargNotNull.java") public void testInheritNotVarargNotNull() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java"); } @TestMetadata("InheritNotVarargPrimitive.java") public void testInheritNotVarargPrimitive() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java"); } @TestMetadata("InheritNullability.java") public void testInheritNullability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.java"); } @TestMetadata("InheritProjectionKind.java") public void testInheritProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.java"); } @TestMetadata("InheritReadOnliness.java") public void testInheritReadOnliness() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.java"); } @TestMetadata("InheritVararg.java") public void testInheritVararg() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.java"); } @TestMetadata("InheritVarargInteger.java") public void testInheritVarargInteger() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.java"); } @TestMetadata("InheritVarargNotNull.java") public void testInheritVarargNotNull() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.java"); } @TestMetadata("InheritVarargPrimitive.java") public void testInheritVarargPrimitive() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java"); } @TestMetadata("Kt3302.java") public void testKt3302() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/Kt3302.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.java"); } @TestMetadata("MutableToReadOnly.java") public void testMutableToReadOnly() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.java"); } @TestMetadata("NotNullToNullable.java") public void testNotNullToNullable() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.java"); } @TestMetadata("NullableToNotNull.java") public void testNullableToNotNull() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.java"); } @TestMetadata("NullableToNotNullKotlinSignature.java") public void testNullableToNotNullKotlinSignature() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java"); } @TestMetadata("OverrideWithErasedParameter.java") public void testOverrideWithErasedParameter() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java"); } @TestMetadata("ReadOnlyToMutable.java") public void testReadOnlyToMutable() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java"); } @TestMetadata("SubclassFromGenericAndNot.java") public void testSubclassFromGenericAndNot() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java"); } @TestMetadata("SubstitutedClassParameter.java") public void testSubstitutedClassParameter() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java"); } @TestMetadata("SubstitutedClassParameters.java") public void testSubstitutedClassParameters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return") + @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/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java"); } @TestMetadata("AddNotNullSameJavaType.java") public void testAddNotNullSameJavaType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.java"); } @TestMetadata("AddNullabilityJavaSubtype.java") public void testAddNullabilityJavaSubtype() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java"); } @TestMetadata("AddNullabilitySameGenericType1.java") public void testAddNullabilitySameGenericType1() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java"); } @TestMetadata("AddNullabilitySameGenericType2.java") public void testAddNullabilitySameGenericType2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java"); } @TestMetadata("AddNullabilitySameJavaType.java") public void testAddNullabilitySameJavaType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java"); + 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/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java"); } @TestMetadata("DeeplySubstitutedClassParameter.java") public void testDeeplySubstitutedClassParameter() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java"); } @TestMetadata("DeeplySubstitutedClassParameter2.java") public void testDeeplySubstitutedClassParameter2() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java"); } @TestMetadata("HalfSubstitutedTypeParameters.java") public void testHalfSubstitutedTypeParameters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java"); } @TestMetadata("InheritNullabilityGenericSubclassSimple.java") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java"); } @TestMetadata("InheritNullabilityJavaSubtype.java") public void testInheritNullabilityJavaSubtype() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java"); } @TestMetadata("InheritNullabilitySameGenericType.java") public void testInheritNullabilitySameGenericType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java"); } @TestMetadata("InheritNullabilitySameJavaType.java") public void testInheritNullabilitySameJavaType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java"); } @TestMetadata("InheritProjectionKind.java") public void testInheritProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.java"); } @TestMetadata("InheritReadOnlinessOfArgument.java") public void testInheritReadOnlinessOfArgument() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java"); } @TestMetadata("InheritReadOnlinessSameClass.java") public void testInheritReadOnlinessSameClass() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java"); } @TestMetadata("InheritReadOnlinessSubclass.java") public void testInheritReadOnlinessSubclass() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java"); } @TestMetadata("SameProjectionKind.java") public void testSameProjectionKind() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.java"); } @TestMetadata("SubclassFromGenericAndNot.java") public void testSubclassFromGenericAndNot() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java"); } @TestMetadata("SubclassOfCollection.java") public void testSubclassOfCollection() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.java"); } @TestMetadata("SubclassOfMapEntry.java") public void testSubclassOfMapEntry() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.java"); } @TestMetadata("SubstitutedClassParameter.java") public void testSubstitutedClassParameter() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.java"); } @TestMetadata("SubstitutedClassParameters.java") public void testSubstitutedClassParameters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.java"); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.java") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java"); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.java") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java"); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.java") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java"); } @TestMetadata("TwoSuperclassesMutableAndNot.java") public void testTwoSuperclassesMutableAndNot() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java"); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.java") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java"); } @TestMetadata("TwoSuperclassesReturnSameJavaType.java") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java"); } @TestMetadata("TwoSuperclassesSupplementNotNull.java") public void testTwoSuperclassesSupplementNotNull() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java"); } @TestMetadata("TypeParamOfClass.java") public void testTypeParamOfClass() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.java"); } @TestMetadata("TypeParamOfClassSubstituted.java") public void testTypeParamOfClassSubstituted() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java"); } @TestMetadata("TypeParamOfFun.java") public void testTypeParamOfFun() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.java"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter") + @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/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true); + 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/kotlinSignature/propagation/typeParameter/InheritMutability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.java"); } @TestMetadata("InheritNullability.java") public void testInheritNullability() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.java"); } @TestMetadata("InheritReadOnliness.java") public void testInheritReadOnliness() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java"); } @TestMetadata("TwoBounds.java") public void testTwoBounds() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.java"); } @TestMetadata("TwoSuperclasses.java") public void testTwoSuperclasses() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java"); } @TestMetadata("TwoTypeParameters.java") public void testTwoTypeParameters() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java"); } @TestMetadata("UseParameterAsUpperBound.java") public void testUseParameterAsUpperBound() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java"); } @TestMetadata("UseParameterInUpperBound.java") public void testUseParameterInUpperBound() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java"); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.java") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - doTest("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java"); } } @@ -881,74 +881,74 @@ public static Test innerSuite() { } } - @TestMetadata("compiler/testData/loadJava/library") + @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/library"), Pattern.compile("^(.+)\\.java$"), true); + 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/library/LoadIterable.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.java"); } @TestMetadata("LoadIterator.java") public void testLoadIterator() throws Exception { - doTest("compiler/testData/loadJava/library/LoadIterator.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.java"); } } - @TestMetadata("compiler/testData/loadJava/modality") + @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/modality"), Pattern.compile("^(.+)\\.java$"), true); + 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/modality/ModalityOfFakeOverrides.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.java"); } } - @TestMetadata("compiler/testData/loadJava/notNull") + @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/notNull"), Pattern.compile("^(.+)\\.java$"), true); + 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/notNull/NotNullField.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.java"); } @TestMetadata("NotNullMethod.java") public void testNotNullMethod() throws Exception { - doTest("compiler/testData/loadJava/notNull/NotNullMethod.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.java"); } @TestMetadata("NotNullParameter.java") public void testNotNullParameter() throws Exception { - doTest("compiler/testData/loadJava/notNull/NotNullParameter.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.java"); } } - @TestMetadata("compiler/testData/loadJava/vararg") + @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/vararg"), Pattern.compile("^(.+)\\.java$"), true); + 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/vararg/VarargInt.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.java"); } @TestMetadata("VarargString.java") public void testVarargString() throws Exception { - doTest("compiler/testData/loadJava/vararg/VarargString.java"); + doTest("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.java"); } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 207adfd55cf02..c8134e41c6d42 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -30,7 +30,7 @@ /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.LoadJava.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) +@InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.CompiledJavaCompareWithKotlin.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest { @TestMetadata("compiler/testData/loadKotlin") @InnerTestClasses({LoadKotlin.Class.class, LoadKotlin.ClassFun.class, LoadKotlin.ClassObject.class, LoadKotlin.Constructor.class, LoadKotlin.DataClass.class, LoadKotlin.Fun.class, LoadKotlin.Prop.class, LoadKotlin.Type.class, LoadKotlin.Visibility.class}) @@ -999,834 +999,834 @@ public static Test innerSuite() { } } - @TestMetadata("compiler/testData/loadJava") - @InnerTestClasses({LoadJava.Annotation.class, LoadJava.Constructor.class, LoadJava.JavaBean.class, LoadJava.KotlinSignature.class, LoadJava.Library.class, LoadJava.Modality.class, LoadJava.NotNull.class, LoadJava.Vararg.class}) - public static class LoadJava extends AbstractLazyResolveNamespaceComparingTest { - public void testAllFilesPresentInLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), Pattern.compile("^(.+)\\.kt$"), true); + @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.NotNull.class, CompiledJavaCompareWithKotlin.Vararg.class}) + public static class CompiledJavaCompareWithKotlin extends AbstractLazyResolveNamespaceComparingTest { + public void testAllFilesPresentInCompiledJavaCompareWithKotlin() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") public void testArrayTypeVariance() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ArrayTypeVariance.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt"); } @TestMetadata("ClassDoesNotOverrideMethod.kt") public void testClassDoesNotOverrideMethod() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassDoesNotOverrideMethod.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.kt"); } @TestMetadata("ClassWithTypeP.kt") public void testClassWithTypeP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypeP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt"); } @TestMetadata("ClassWithTypePExtendsIterableP.kt") public void testClassWithTypePExtendsIterableP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePExtendsIterableP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePExtendsIterableP.kt"); } @TestMetadata("ClassWithTypePP.kt") public void testClassWithTypePP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt"); } @TestMetadata("ClassWithTypePRefNext.kt") public void testClassWithTypePRefNext() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePRefNext.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt"); } @TestMetadata("ClassWithTypePRefSelf.kt") public void testClassWithTypePRefSelf() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePRefSelf.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt"); } @TestMetadata("ClassWithTypePRefSelfAndClass.kt") public void testClassWithTypePRefSelfAndClass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt"); } @TestMetadata("FieldAsVar.kt") public void testFieldAsVar() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/FieldAsVar.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt"); } @TestMetadata("FieldOfArrayType.kt") public void testFieldOfArrayType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/FieldOfArrayType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt"); } @TestMetadata("FinalFieldAsVal.kt") public void testFinalFieldAsVal() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/FinalFieldAsVal.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt"); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/InnerClass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt"); } @TestMetadata("InnerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/InnerClassReferencesOuterTP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt"); } @TestMetadata("InnerClassesInGeneric.kt") public void testInnerClassesInGeneric() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/InnerClassesInGeneric.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt"); } @TestMetadata("MethodReferencesOuterClassTP.kt") public void testMethodReferencesOuterClassTP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodReferencesOuterClassTP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.kt"); } @TestMetadata("MethodTypePOneUpperBound.kt") public void testMethodTypePOneUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodTypePOneUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.kt"); } @TestMetadata("MethodTypePTwoUpperBounds.kt") public void testMethodTypePTwoUpperBounds() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodTypePTwoUpperBounds.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.kt"); } @TestMetadata("MethodWithTypeP.kt") public void testMethodWithTypeP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodWithTypeP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.kt"); } @TestMetadata("MethodWithTypePP.kt") public void testMethodWithTypePP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodWithTypePP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.kt"); } @TestMetadata("MethodWithTypePRefClassP.kt") public void testMethodWithTypePRefClassP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethodWithTypePRefClassP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.kt"); } @TestMetadata("MethosWithPRefTP.kt") public void testMethosWithPRefTP() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MethosWithPRefTP.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.kt"); } @TestMetadata("MyException.kt") public void testMyException() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MyException.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.kt"); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/NestedClass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.kt"); } @TestMetadata("RemoveRedundantProjectionKind.kt") public void testRemoveRedundantProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/RemoveRedundantProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.kt"); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/Simple.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.kt"); } @TestMetadata("TwoFields.kt") public void testTwoFields() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/TwoFields.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.kt"); } @TestMetadata("UnboundWildcard.kt") public void testUnboundWildcard() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/UnboundWildcard.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.kt"); } - @TestMetadata("compiler/testData/loadJava/annotation") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation") public static class Annotation extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/annotation"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") public void testAnnotatedAnnotation() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/annotation/AnnotatedAnnotation.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedAnnotation.kt"); } @TestMetadata("AnnotatedMethod.kt") public void testAnnotatedMethod() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/annotation/AnnotatedMethod.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.kt"); } @TestMetadata("SimpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/annotation/SimpleAnnotation.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/SimpleAnnotation.kt"); } } - @TestMetadata("compiler/testData/loadJava/constructor") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor") public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorGenericDeep.kt") public void testConstructorGenericDeep() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/constructor/ConstructorGenericDeep.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.kt"); } @TestMetadata("ConstructorGenericSimple.kt") public void testConstructorGenericSimple() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/constructor/ConstructorGenericSimple.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.kt"); } @TestMetadata("ConstructorGenericUpperBound.kt") public void testConstructorGenericUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.kt"); } } - @TestMetadata("compiler/testData/loadJava/javaBean") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean") public static class JavaBean extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") public void testDifferentGetterAndSetter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.kt"); } @TestMetadata("JavaBeanAbstractGetter.kt") public void testJavaBeanAbstractGetter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.kt"); } @TestMetadata("JavaBeanVal.kt") public void testJavaBeanVal() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/JavaBeanVal.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.kt"); } @TestMetadata("JavaBeanVar.kt") public void testJavaBeanVar() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/JavaBeanVar.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.kt"); } @TestMetadata("JavaBeanVarOfGenericType.kt") public void testJavaBeanVarOfGenericType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.kt"); } @TestMetadata("TwoSetters.kt") public void testTwoSetters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/javaBean/TwoSetters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.kt"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") public void testArrayType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ArrayType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.kt"); } @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt"); } @TestMetadata("ConstructorWithParentTypeParams.kt") public void testConstructorWithParentTypeParams() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt"); } @TestMetadata("ConstructorWithSeveralParams.kt") public void testConstructorWithSeveralParams() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt"); } @TestMetadata("ConstructorWithoutParams.kt") public void testConstructorWithoutParams() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt"); } @TestMetadata("CustomProjectionKind.kt") public void testCustomProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.kt"); } @TestMetadata("MethodWithFunctionTypes.kt") public void testMethodWithFunctionTypes() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt"); } @TestMetadata("MethodWithGenerics.kt") public void testMethodWithGenerics() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt"); } @TestMetadata("MethodWithMappedClasses.kt") public void testMethodWithMappedClasses() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt"); } @TestMetadata("MethodWithTypeParameters.kt") public void testMethodWithTypeParameters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt"); } @TestMetadata("MethodWithVararg.kt") public void testMethodWithVararg() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/MethodWithVararg.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt"); } @TestMetadata("PropertyArrayTypes.kt") public void testPropertyArrayTypes() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.kt"); } @TestMetadata("PropertyComplexTypes.kt") public void testPropertyComplexTypes() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.kt"); } @TestMetadata("PropertySimpleType.kt") public void testPropertySimpleType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.kt"); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/StarProjection.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.kt"); } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/error") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error") public static class Error extends AbstractLazyResolveNamespaceComparingTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/AddingNullability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt"); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") public void testConflictingProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.kt"); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") public void testExplicitFieldGettersAndSetters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); } @TestMetadata("ExtraUpperBound.kt") public void testExtraUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.kt"); } @TestMetadata("MissingUpperBound.kt") public void testMissingUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.kt"); } @TestMetadata("NoFieldTypeRef.kt") public void testNoFieldTypeRef() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.kt"); } @TestMetadata("NotVarargReplacedWithVararg.kt") public void testNotVarargReplacedWithVararg() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); } @TestMetadata("RedundantProjectionKind.kt") public void testRedundantProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/RedundantProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt"); } @TestMetadata("ReturnTypeMissing.kt") public void testReturnTypeMissing() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.kt"); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/SyntaxError.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.kt"); } @TestMetadata("SyntaxErrorInFieldAnnotation.kt") public void testSyntaxErrorInFieldAnnotation() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); } @TestMetadata("VarargReplacedWithNotVararg.kt") public void testVarargReplacedWithNotVararg() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); } @TestMetadata("WrongFieldInitializer.kt") public void testWrongFieldInitializer() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.kt"); } @TestMetadata("WrongFieldMutability.kt") public void testWrongFieldMutability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.kt"); } @TestMetadata("WrongFieldName.kt") public void testWrongFieldName() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.kt"); } @TestMetadata("WrongMethodName.kt") public void testWrongMethodName() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.kt"); } @TestMetadata("WrongProjectionKind.kt") public void testWrongProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.kt"); } @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.kt"); } @TestMetadata("WrongTypeName1.kt") public void testWrongTypeName1() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.kt"); } @TestMetadata("WrongTypeName2.kt") public void testWrongTypeName2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.kt"); } @TestMetadata("WrongTypeName3.kt") public void testWrongTypeName3() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.kt"); } @TestMetadata("WrongTypeParameterBoundStructure1.kt") public void testWrongTypeParameterBoundStructure1() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); } @TestMetadata("WrongTypeParameterBoundStructure2.kt") public void testWrongTypeParameterBoundStructure2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); } @TestMetadata("WrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.kt"); } @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.kt"); } @TestMetadata("WrongValueParameterStructure2.kt") public void testWrongValueParameterStructure2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.kt"); } @TestMetadata("WrongValueParametersCount.kt") public void testWrongValueParametersCount() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.kt"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) public static class Propagation extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") public void testPropagateTypeArgumentNullable() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/parameter") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter") public static class Parameter extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") public void testChangeProjectionKind1() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); } @TestMetadata("ChangeProjectionKind2.kt") public void testChangeProjectionKind2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt"); } @TestMetadata("InheritNotVararg.kt") public void testInheritNotVararg() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); } @TestMetadata("InheritNotVarargInteger.kt") public void testInheritNotVarargInteger() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); } @TestMetadata("InheritNotVarargNotNull.kt") public void testInheritNotVarargNotNull() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); } @TestMetadata("InheritNotVarargPrimitive.kt") public void testInheritNotVarargPrimitive() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt"); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); } @TestMetadata("InheritVararg.kt") public void testInheritVararg() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.kt"); } @TestMetadata("InheritVarargInteger.kt") public void testInheritVarargInteger() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); } @TestMetadata("InheritVarargNotNull.kt") public void testInheritVarargNotNull() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); } @TestMetadata("InheritVarargPrimitive.kt") public void testInheritVarargPrimitive() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); } @TestMetadata("Kt3302.kt") public void testKt3302() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt"); } @TestMetadata("MutableToReadOnly.kt") public void testMutableToReadOnly() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); } @TestMetadata("NotNullToNullable.kt") public void testNotNullToNullable() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); } @TestMetadata("NullableToNotNull.kt") public void testNullableToNotNull() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); } @TestMetadata("NullableToNotNullKotlinSignature.kt") public void testNullableToNotNullKotlinSignature() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); } @TestMetadata("OverrideWithErasedParameter.kt") public void testOverrideWithErasedParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); } @TestMetadata("ReadOnlyToMutable.kt") public void testReadOnlyToMutable() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return") public static class Return extends AbstractLazyResolveNamespaceComparingTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); } @TestMetadata("AddNotNullSameJavaType.kt") public void testAddNotNullSameJavaType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); } @TestMetadata("AddNullabilityJavaSubtype.kt") public void testAddNullabilityJavaSubtype() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); } @TestMetadata("AddNullabilitySameGenericType1.kt") public void testAddNullabilitySameGenericType1() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); } @TestMetadata("AddNullabilitySameGenericType2.kt") public void testAddNullabilitySameGenericType2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); } @TestMetadata("AddNullabilitySameJavaType.kt") public void testAddNullabilitySameJavaType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") public void testCantMakeImmutableInSubclass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); } @TestMetadata("HalfSubstitutedTypeParameters.kt") public void testHalfSubstitutedTypeParameters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); } @TestMetadata("InheritNullabilityGenericSubclassSimple.kt") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); } @TestMetadata("InheritNullabilityJavaSubtype.kt") public void testInheritNullabilityJavaSubtype() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); } @TestMetadata("InheritNullabilitySameGenericType.kt") public void testInheritNullabilitySameGenericType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); } @TestMetadata("InheritNullabilitySameJavaType.kt") public void testInheritNullabilitySameJavaType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.kt"); } @TestMetadata("InheritReadOnlinessOfArgument.kt") public void testInheritReadOnlinessOfArgument() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); } @TestMetadata("InheritReadOnlinessSameClass.kt") public void testInheritReadOnlinessSameClass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); } @TestMetadata("InheritReadOnlinessSubclass.kt") public void testInheritReadOnlinessSubclass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); } @TestMetadata("SameProjectionKind.kt") public void testSameProjectionKind() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.kt"); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); } @TestMetadata("SubclassOfCollection.kt") public void testSubclassOfCollection() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.kt"); } @TestMetadata("SubclassOfMapEntry.kt") public void testSubclassOfMapEntry() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); } @TestMetadata("TwoSuperclassesMutableAndNot.kt") public void testTwoSuperclassesMutableAndNot() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); } @TestMetadata("TwoSuperclassesReturnSameJavaType.kt") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); } @TestMetadata("TwoSuperclassesSupplementNotNull.kt") public void testTwoSuperclassesSupplementNotNull() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); } @TestMetadata("TypeParamOfClass.kt") public void testTypeParamOfClass() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.kt"); } @TestMetadata("TypeParamOfClassSubstituted.kt") public void testTypeParamOfClassSubstituted() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); } @TestMetadata("TypeParamOfFun.kt") public void testTypeParamOfFun() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.kt"); } } - @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter") public static class TypeParameter extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); } @TestMetadata("TwoBounds.kt") public void testTwoBounds() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); } @TestMetadata("TwoSuperclasses.kt") public void testTwoSuperclasses() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); } @TestMetadata("TwoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); } @TestMetadata("UseParameterAsUpperBound.kt") public void testUseParameterAsUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); } @TestMetadata("UseParameterInUpperBound.kt") public void testUseParameterInUpperBound() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); } } @@ -1850,81 +1850,81 @@ public static Test innerSuite() { } } - @TestMetadata("compiler/testData/loadJava/library") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library") public static class Library extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/library/LoadIterable.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.kt"); } @TestMetadata("LoadIterator.kt") public void testLoadIterator() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/library/LoadIterator.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.kt"); } } - @TestMetadata("compiler/testData/loadJava/modality") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality") public static class Modality extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") public void testModalityOfFakeOverrides() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/modality/ModalityOfFakeOverrides.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.kt"); } } - @TestMetadata("compiler/testData/loadJava/notNull") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull") public static class NotNull extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") public void testNotNullField() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/notNull/NotNullField.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.kt"); } @TestMetadata("NotNullMethod.kt") public void testNotNullMethod() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/notNull/NotNullMethod.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.kt"); } @TestMetadata("NotNullParameter.kt") public void testNotNullParameter() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/notNull/NotNullParameter.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.kt"); } } - @TestMetadata("compiler/testData/loadJava/vararg") + @TestMetadata("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg") public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("VarargInt.kt") public void testVarargInt() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/vararg/VarargInt.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.kt"); } @TestMetadata("VarargString.kt") public void testVarargString() throws Exception { - doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/vararg/VarargString.kt"); + doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.kt"); } } public static Test innerSuite() { - TestSuite suite = new TestSuite("LoadJava"); - suite.addTestSuite(LoadJava.class); + TestSuite suite = new TestSuite("CompiledJavaCompareWithKotlin"); + suite.addTestSuite(CompiledJavaCompareWithKotlin.class); suite.addTestSuite(Annotation.class); suite.addTestSuite(Constructor.class); suite.addTestSuite(JavaBean.class); @@ -2028,7 +2028,7 @@ public void testVarargIterator() throws Exception { public static Test suite() { TestSuite suite = new TestSuite("LazyResolveNamespaceComparingTestGenerated"); suite.addTest(LoadKotlin.innerSuite()); - suite.addTest(LoadJava.innerSuite()); + suite.addTest(CompiledJavaCompareWithKotlin.innerSuite()); suite.addTestSuite(NamespaceComparator.class); return suite; } diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 29e64ee3a6ce4..6c2dcaebdd8a1 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -147,7 +147,7 @@ public static void main(String[] args) throws IOException { "compiler/tests/", "LoadJavaTestGenerated", AbstractLoadJavaTest.class, - testModel("compiler/testData/loadJava", true, "java", "doTest") + testModel("compiler/testData/loadJava/compiledJavaCompareWithKotlin", true, "java", "doTest") ); generateTest( @@ -197,7 +197,7 @@ public static void main(String[] args) throws IOException { "LazyResolveNamespaceComparingTestGenerated", AbstractLazyResolveNamespaceComparingTest.class, testModel("compiler/testData/loadKotlin", "doTestCheckingPrimaryConstructors"), - testModel("compiler/testData/loadJava", "doTestNotCheckingPrimaryConstructors"), + testModel("compiler/testData/loadJava/compiledJavaCompareWithKotlin", "doTestNotCheckingPrimaryConstructors"), testModel("compiler/testData/lazyResolve/namespaceComparator", "doTestCheckingPrimaryConstructors") );